move some headers inside sfx2/

Change-Id: I806735926661ae4a666725f970ee86f0cb816a49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88562
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

98 files changed, 207 insertions, 292 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 88ad4981fd0a..d2a5838c2b7e 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -616,9 +616,6 @@ blacklist:
     include/sfx2/mieclip.hxx:
     # Needed for implicit dtor
     - tools/stream.hxx
-    include/sfx2/recentdocsview.hxx:
-    # Needed for struct declaration
-    - com/sun/star/beans/PropertyValue.hpp
     include/sfx2/sfxbasecontroller.hxx:
     # base class has to be a complete type
     - com/sun/star/frame/XController2.hpp
@@ -682,12 +679,6 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/frame/XStatusListener.hpp
     - com/sun/star/lang/XComponent.hpp
-    include/sfx2/sidebar/Accessible.hxx:
-    # base class has to be a complete type
-    - com/sun/star/accessibility/XAccessible.hpp
-    include/sfx2/sidebar/Paint.hxx:
-    # Needed for boost::variant
-    - vcl/gradient.hxx
     include/sfx2/sidebar/SidebarController.hxx:
     # base class has to be a complete type
     - com/sun/star/ui/XContextChangeEventListener.hpp
@@ -705,25 +696,9 @@ blacklist:
     include/sfx2/sidebar/Theme.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
-    include/sfx2/sidebar/UnoDeck.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XDeck.hpp
-    include/sfx2/sidebar/UnoDecks.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XDecks.hpp
-    include/sfx2/sidebar/UnoPanel.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XPanel.hpp
-    include/sfx2/sidebar/UnoPanels.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XPanels.hpp
     include/sfx2/sidebar/UnoSidebar.hxx:
     # base class has to be a complete type
     - com/sun/star/ui/XSidebarProvider.hpp
-    include/sfx2/unoctitm.hxx:
-    # base class has to be a complete type
-    - com/sun/star/frame/XNotifyingDispatch.hpp
-    - com/sun/star/lang/XUnoTunnel.hpp
     include/sfx2/viewsh.hxx:
     # Needed for macro 
     - class SfxViewFactory
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index ddb3efcaa2ba..16c922da30a7 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -1,6 +1,31 @@
 ---
 assumeFilename: sfx2/source/appl/app.cxx
 blacklist:
+    sfx2/inc/sidebar/Accessible.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessible.hpp
+    sfx2/inc/sidebar/Paint.hxx:
+    # Needed for boost::variant
+    - vcl/gradient.hxx
+    sfx2/inc/sidebar/UnoDeck.hxx:
+    # base class has to be a complete type
+    - com/sun/star/ui/XDeck.hpp
+    sfx2/inc/sidebar/UnoDecks.hxx:
+    # base class has to be a complete type
+    - com/sun/star/ui/XDecks.hpp
+    sfx2/inc/sidebar/UnoPanel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/ui/XPanel.hpp
+    sfx2/inc/sidebar/UnoPanels.hxx:
+    # base class has to be a complete type
+    - com/sun/star/ui/XPanels.hpp
+    sfx2/inc/recentdocsview.hxx:
+    # Needed for struct declaration
+    - com/sun/star/beans/PropertyValue.hpp
+    sfx2/inc/unoctitm.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XNotifyingDispatch.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
     sfx2/source/doc/syspathw32.hxx:
     # Needed on WIN32
     - sal/types.h
diff --git a/include/sfx2/charmapcontrol.hxx b/sfx2/inc/charmapcontrol.hxx
index 31a7ce5937e7..0902f17fa94f 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/sfx2/inc/charmapcontrol.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SFX2_INC_CHARMAPCONTROL_HXX
-#define INCLUDED_SFX2_INC_CHARMAPCONTROL_HXX
+#pragma once
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
@@ -64,6 +63,4 @@ private:
     void            updateRecentCharControl();
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/checkin.hxx b/sfx2/inc/checkin.hxx
index 78535f7aab9d..78535f7aab9d 100644
--- a/include/sfx2/checkin.hxx
+++ b/sfx2/inc/checkin.hxx
diff --git a/include/sfx2/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx
index 33d0e021bbe1..33d0e021bbe1 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/sfx2/inc/emojicontrol.hxx
diff --git a/include/sfx2/emojiview.hxx b/sfx2/inc/emojiview.hxx
index 8a08e1d8c75d..212a785de445 100644
--- a/include/sfx2/emojiview.hxx
+++ b/sfx2/inc/emojiview.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_SOURCE_INC_EMOJIVIEW_HXX
-#define INCLUDED_SFX2_SOURCE_INC_EMOJIVIEW_HXX
+#pragma once
 
 #include <sfx2/thumbnailview.hxx>
 
@@ -76,6 +75,4 @@ private:
     Link<ThumbnailViewItem*, void> maInsertEmojiHdl;
 };
 
-#endif // INCLUDED_SFX2_SOURCE_INC_EMOJIVIEW_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/emojiviewitem.hxx b/sfx2/inc/emojiviewitem.hxx
index 65fd8005a7f7..bbdcf329f392 100644
--- a/include/sfx2/emojiviewitem.hxx
+++ b/sfx2/inc/emojiviewitem.hxx
@@ -7,10 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_SOURCE_INC_EMOJIVIEWITEM_HXX
-#define INCLUDED_SFX2_SOURCE_INC_EMOJIVIEWITEM_HXX
+#pragma once
 
-#include <sfx2/thumbnailviewitem.hxx>
+#include "thumbnailviewitem.hxx"
 
 class EmojiViewItem final : public ThumbnailViewItem
 {
@@ -33,6 +32,4 @@ private:
     OUString msCategory;
 };
 
-#endif // INCLUDED_SFX2_SOURCE_INC_EMOJIVIEWITEM_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
index 440148beff0d..f2f62a70bddb 100644
--- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
+++ b/sfx2/inc/notebookbar/NotebookbarTabControl.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
-#define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
+#pragma once
 
 #include <sfx2/dllapi.h>
 #include <vcl/tabctrl.hxx>
@@ -47,6 +46,4 @@ private:
     bool m_bInvalidate;
 };
 
-#endif // INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index efa6a446c846..306c66fdef39 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -437,36 +437,36 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/sidebar/Context.hxx>
-#include <sfx2/sidebar/ControllerFactory.hxx>
+#include <sidebar/ControllerFactory.hxx>
 #include <sfx2/sidebar/Deck.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/DeckTitleBar.hxx>
-#include <sfx2/sidebar/DrawHelper.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckTitleBar.hxx>
+#include <sidebar/DrawHelper.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Panel.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sidebar/TabBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/TitleBar.hxx>
+#include <sidebar/TitleBar.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/stbitem.hxx>
 #include <sfx2/styfitem.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include <sfx2/templatecontaineritem.hxx>
+#include <templatecontaineritem.hxx>
 #include <sfx2/templatedlg.hxx>
 #include <sfx2/templatelocalview.hxx>
-#include <sfx2/templateviewitem.hxx>
+#include <templateviewitem.hxx>
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 #include <sfx2/tplpitem.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/include/sfx2/recentdocsview.hxx b/sfx2/inc/recentdocsview.hxx
index 6eb48dddd47a..e5f7ebfb5a8e 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/sfx2/inc/recentdocsview.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_RECENTDOCSVIEW_HXX
-#define INCLUDED_SFX2_RECENTDOCSVIEW_HXX
+#pragma once
 
 #include <sfx2/thumbnailview.hxx>
 #include <vcl/image.hxx>
@@ -97,6 +96,4 @@ private:
 
 } // namespace sfx2
 
-#endif // INCLUDED_SFX2_RECENTDOCSVIEW_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Accessible.hxx b/sfx2/inc/sidebar/Accessible.hxx
index 8ba5f03d9daf..f216da980cf2 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/sfx2/inc/sidebar/Accessible.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX
+#pragma once
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
@@ -58,6 +57,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
index 5ce9ae311e10..58f70e3efd3b 100644
--- a/include/sfx2/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/inc/sidebar/AccessibleTitleBar.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX
+#pragma once
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
@@ -42,6 +41,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ContextList.hxx b/sfx2/inc/sidebar/ContextList.hxx
index fc2f6845fbf5..2ca07d36d416 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/sfx2/inc/sidebar/ContextList.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX
+#pragma once
 
 #include <sfx2/sidebar/Context.hxx>
 #include <rtl/ustring.hxx>
@@ -64,6 +63,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/sfx2/inc/sidebar/ControllerFactory.hxx
index e84b139563a4..66c3e432aebc 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sidebar/ControllerFactory.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX
-#define INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX
+#pragma once
 
 #include <sfx2/dllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
@@ -64,6 +63,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/sfx2/inc/sidebar/DeckDescriptor.hxx
index 9a205335b6e2..92a229f41c47 100644
--- a/include/sfx2/sidebar/DeckDescriptor.hxx
+++ b/sfx2/inc/sidebar/DeckDescriptor.hxx
@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
+#pragma once
 
-#include <sfx2/sidebar/ContextList.hxx>
+#include <sidebar/ContextList.hxx>
 
 #include <sfx2/sidebar/Deck.hxx>
 
@@ -51,6 +50,4 @@ public:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/sfx2/inc/sidebar/DeckLayouter.hxx
index 0d9c7c2b90f4..ed74e6261742 100644
--- a/include/sfx2/sidebar/DeckLayouter.hxx
+++ b/sfx2/inc/sidebar/DeckLayouter.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKLAYOUTER_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKLAYOUTER_HXX
+#pragma once
 
 #include <sfx2/sidebar/Panel.hxx>
 
@@ -46,6 +45,4 @@ namespace DeckLayouter
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx
index bb49467c8431..bc522d87a889 100644
--- a/include/sfx2/sidebar/DeckTitleBar.hxx
+++ b/sfx2/inc/sidebar/DeckTitleBar.hxx
@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKTITLEBAR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKTITLEBAR_HXX
+#pragma once
 
-#include <sfx2/sidebar/TitleBar.hxx>
+#include <sidebar/TitleBar.hxx>
 
 namespace sfx2 { namespace sidebar {
 
@@ -50,6 +49,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/DrawHelper.hxx b/sfx2/inc/sidebar/DrawHelper.hxx
index 6bf6d17756a0..64e173ce317a 100644
--- a/include/sfx2/sidebar/DrawHelper.hxx
+++ b/sfx2/inc/sidebar/DrawHelper.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
+#pragma once
 
 #include <vcl/outdev.hxx>
 
@@ -45,6 +44,4 @@ public:
 
 }} // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/MenuButton.hxx b/sfx2/inc/sidebar/MenuButton.hxx
index cccebd7e577a..36d18a0b836a 100644
--- a/include/sfx2/sidebar/MenuButton.hxx
+++ b/sfx2/inc/sidebar/MenuButton.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_MENUBUTTON_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_MENUBUTTON_HXX
+#pragma once
 
 #include <vcl/button.hxx>
 
@@ -43,6 +42,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/Paint.hxx b/sfx2/inc/sidebar/Paint.hxx
index f693482a6c75..e93c6d28d829 100644
--- a/include/sfx2/sidebar/Paint.hxx
+++ b/sfx2/inc/sidebar/Paint.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
+#pragma once
 
 #include <vcl/gradient.hxx>
 #include <vcl/wall.hxx>
@@ -71,6 +70,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/sfx2/inc/sidebar/PanelDescriptor.hxx
index 2fdf2b1d4702..42dd7b8578c3 100644
--- a/include/sfx2/sidebar/PanelDescriptor.hxx
+++ b/sfx2/inc/sidebar/PanelDescriptor.hxx
@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
+#pragma once
 
-#include <sfx2/sidebar/ContextList.hxx>
+#include <sidebar/ContextList.hxx>
 
 namespace sfx2 { namespace sidebar {
 
@@ -48,6 +47,4 @@ public:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 4a8799975fb8..1806f1bb133d 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELTITLEBAR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELTITLEBAR_HXX
+#pragma once
 
-#include <sfx2/sidebar/TitleBar.hxx>
+#include <sidebar/TitleBar.hxx>
 
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XFrame; }
@@ -60,6 +59,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/TabItem.hxx b/sfx2/inc/sidebar/TabItem.hxx
index 8d54640a680c..c80604b86b6f 100644
--- a/include/sfx2/sidebar/TabItem.hxx
+++ b/sfx2/inc/sidebar/TabItem.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TABITEM_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_TABITEM_HXX
+#pragma once
 
 #include <vcl/button.hxx>
 
@@ -44,6 +43,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx
index f06f6aa83fa8..8a22303aabbf 100644
--- a/include/sfx2/sidebar/TitleBar.hxx
+++ b/sfx2/inc/sidebar/TitleBar.hxx
@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TITLEBAR_HXX
-#define INCLUDED_SFX2_SOURCE_SIDEBAR_TITLEBAR_HXX
+#pragma once
 
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/Paint.hxx>
 
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 
@@ -74,6 +73,4 @@ private:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/sfx2/inc/sidebar/UnoDeck.hxx
index fc719dee49d2..c2f10b36452e 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/sfx2/inc/sidebar/UnoDeck.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_SFX2_SIDEBAR_UNODECK_HXX
-#define INCLUDED_SFX2_SIDEBAR_UNODECK_HXX
+#pragma once
 
 
 #include <com/sun/star/ui/XDeck.hpp>
@@ -60,6 +59,4 @@ private:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/sfx2/inc/sidebar/UnoDecks.hxx
index 5ee4a5244fb2..d0a5b710e05a 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/sfx2/inc/sidebar/UnoDecks.hxx
@@ -8,9 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_SFX2_SIDEBAR_DECKS_HXX
-#define INCLUDED_SFX2_SIDEBAR_DECKS_HXX
-
+#pragma once
 
 #include <com/sun/star/ui/XDecks.hpp>
 
@@ -53,6 +51,4 @@ private:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/sfx2/inc/sidebar/UnoPanel.hxx
index 7d82662eaaf2..07fa526907a1 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/sfx2/inc/sidebar/UnoPanel.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_SFX2_SIDEBAR_UNOPANEL_HXX
-#define INCLUDED_SFX2_SIDEBAR_UNOPANEL_HXX
+#pragma once
 
 #include <com/sun/star/ui/XPanel.hpp>
 
@@ -67,6 +66,4 @@ private:
     sal_Int32 GetMinOrderIndex(sfx2::sidebar::ResourceManager::PanelContextDescriptorContainer aPanels);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/sfx2/inc/sidebar/UnoPanels.hxx
index 247f0ceb4814..598db749ee1f 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/sfx2/inc/sidebar/UnoPanels.hxx
@@ -6,9 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
-#ifndef INCLUDED_SFX2_SIDEBAR_PANELS_HXX
-#define INCLUDED_SFX2_SIDEBAR_PANELS_HXX
+#pragma once
 
 
 #include <com/sun/star/ui/XPanels.hpp>
@@ -56,6 +54,4 @@ private:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templatecontaineritem.hxx b/sfx2/inc/templatecontaineritem.hxx
index f7a19f64164f..0e618e48ee5a 100644
--- a/include/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/templatecontaineritem.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
-#define INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
+#pragma once
 
 #include <sfx2/templateproperties.hxx>
 
@@ -25,6 +24,4 @@ public:
     ~TemplateContainerItem ();
 };
 
-#endif // INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templatedefaultview.hxx b/sfx2/inc/templatedefaultview.hxx
index 598653981f7b..9020a779bfd9 100644
--- a/include/sfx2/templatedefaultview.hxx
+++ b/sfx2/inc/templatedefaultview.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
-#define INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
+#pragma once
 
 #include <sfx2/templatelocalview.hxx>
 
@@ -31,5 +30,4 @@ private:
     long    mnItemMaxSize;
 };
 
-#endif // INCLUDED_SFX2_TEMPLATEDEFAULTVIEW_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templateviewitem.hxx b/sfx2/inc/templateviewitem.hxx
index 21433157f796..64faf438b847 100644
--- a/include/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/templateviewitem.hxx
@@ -7,10 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
-#define INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
+#pragma once
 
-#include <sfx2/thumbnailviewitem.hxx>
+#include "thumbnailviewitem.hxx"
 
 class TemplateViewItem : public ThumbnailViewItem
 {
@@ -43,6 +42,4 @@ private:
     bool mbIsDefaultTemplate;
 };
 
-#endif // INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/thumbnailviewitem.hxx b/sfx2/inc/thumbnailviewitem.hxx
index e5be46e9bb2b..eef035ae09d1 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/thumbnailviewitem.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
-#define INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
+#pragma once
 
 #include <basegfx/vector/b2dvector.hxx>
 #include <drawinglayer/attribute/fontattribute.hxx>
@@ -135,6 +134,4 @@ protected:
     tools::Rectangle maDrawArea;
 };
 
-#endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index 3460d941571a..c180150325cc 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_UNOCTITM_HXX
-#define INCLUDED_SFX2_UNOCTITM_HXX
+#pragma once
 
 #include <memory>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
@@ -143,6 +142,4 @@ public:
     void                SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 1b74848f39cf..fdc3f0304df2 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -25,7 +25,7 @@
 #include <sfx2/module.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/objsh.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <appbaslib.hxx>
 #include <svl/svdde.hxx>
 
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index d3ec722aaead..2cec473fc748 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index c1584878aaca..3ebc6a83bf5d 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -40,7 +40,7 @@
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <appdata.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index b3e630fd73bd..cf5dff142be9 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/module.hxx>
 #include <sfx2/request.hxx>
 #include <workwin.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index f4fff6f14a52..69e1a197d4ee 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -19,7 +19,7 @@
 
 #include <comphelper/dispatchcommand.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <sfx2/charmapcontrol.hxx>
+#include <charmapcontrol.hxx>
 #include <sfx2/charmappopup.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx
index 7713009ec014..2baf021d37bf 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/emojicontrol.hxx>
+#include <emojicontrol.hxx>
 #include <sfx2/emojipopup.hxx>
-#include <sfx2/emojiview.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
+#include <emojiview.hxx>
+#include <thumbnailviewitem.hxx>
 #include <vcl/tabpage.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/dispatchcommand.hxx>
diff --git a/sfx2/source/control/emojipopup.cxx b/sfx2/source/control/emojipopup.cxx
index 513592bf0b92..2fe9173ea8cd 100644
--- a/sfx2/source/control/emojipopup.cxx
+++ b/sfx2/source/control/emojipopup.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sfx2/emojipopup.hxx>
-#include <sfx2/emojicontrol.hxx>
+#include <emojicontrol.hxx>
 #include <vcl/toolbox.hxx>
 
 EmojiPopup::EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index 571681474335..8bc65609d1d0 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/emojiview.hxx>
-#include <sfx2/emojiviewitem.hxx>
+#include <emojiview.hxx>
+#include <emojiviewitem.hxx>
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx>
 #include <config_folders.h>
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index 8a5115a95331..665e24eb79ee 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/emojiviewitem.hxx>
+#include <emojiviewitem.hxx>
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 5367fe718833..d875c73dda17 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/log.hxx>
 #include <comphelper/base64.hxx>
-#include <sfx2/recentdocsview.hxx>
+#include <recentdocsview.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/historyoptions.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx
index 26a281be5e26..7fa4bfaeb508 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -13,7 +13,7 @@
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <i18nutil/paper.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <sfx2/recentdocsview.hxx>
+#include <recentdocsview.hxx>
 #include <sfx2/templatelocalview.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/historyoptions.hxx>
diff --git a/sfx2/source/control/recentdocsviewitem.hxx b/sfx2/source/control/recentdocsviewitem.hxx
index 5f88f4170cae..fd4cddf97da2 100644
--- a/sfx2/source/control/recentdocsviewitem.hxx
+++ b/sfx2/source/control/recentdocsviewitem.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 #define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 
-#include <sfx2/thumbnailviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 
 class ThumbnailView;
 
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 58c6aa522d03..9452d9e7ad91 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -35,7 +35,7 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index ab0e95c91039..c0c92841c0b3 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxuno.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
 
diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx
index 41f1b6b93719..e30b6b7b1f6b 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/templatecontaineritem.hxx>
+#include <templatecontaineritem.hxx>
 
 TemplateContainerItem::TemplateContainerItem (sal_uInt16 nId)
     : mnId(nId)
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 1d170cfef538..65415520b81f 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/templatedefaultview.hxx>
+#include <templatedefaultview.hxx>
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/templateviewitem.hxx>
+#include <templateviewitem.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/event.hxx>
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index f033aaf53747..ecaddc2c9f5d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -13,8 +13,8 @@
 #include <sfx2/doctempl.hxx>
 #include <sfx2/inputdlg.hxx>
 #include <sfx2/sfxresid.hxx>
-#include <sfx2/templatecontaineritem.hxx>
-#include <sfx2/templateviewitem.hxx>
+#include <templatecontaineritem.hxx>
+#include <templateviewitem.hxx>
 #include <sfx2/docfac.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index f77ba6448054..6d8a99e925b5 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/templateviewitem.hxx>
+#include <templateviewitem.hxx>
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index ba829574d6a3..747205cd1f69 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 
 #include <utility>
 
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 53423bd567ae..e1a7a59c9f2a 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -21,7 +21,7 @@
 
 #include <comphelper/servicehelper.hxx>
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 54c2a6e4451e..8936a16627da 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/thumbnailviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 
 #include <sfx2/thumbnailview.hxx>
 #include "thumbnailviewacc.hxx"
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1eac0a9c7964..4d8bff24f497 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -49,7 +49,7 @@
 #include <vcl/uitest/logger.hxx>
 
 #include <sfx2/app.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/ctrlitem.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 10e38a0d2b21..d64a1747bc7b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -31,7 +31,7 @@
 #include <svtools/openfiledroptargetlistener.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svtools/langhelp.hxx>
-#include <sfx2/templateviewitem.hxx>
+#include <templateviewitem.hxx>
 
 #include <vcl/menubtn.hxx>
 
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index c9a803e433b3..a029557324ad 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -28,8 +28,8 @@
 
 #include <vcl/menubtn.hxx>
 
-#include <sfx2/recentdocsview.hxx>
-#include <sfx2/templatedefaultview.hxx>
+#include <recentdocsview.hxx>
+#include <templatedefaultview.hxx>
 
 #include <svtools/acceleratorexecute.hxx>
 
diff --git a/sfx2/source/dialog/charmappopup.cxx b/sfx2/source/dialog/charmappopup.cxx
index 7d01a5a661c4..7788a45c73c0 100644
--- a/sfx2/source/dialog/charmappopup.cxx
+++ b/sfx2/source/dialog/charmappopup.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sfx2/charmappopup.hxx>
-#include <sfx2/charmapcontrol.hxx>
+#include <charmapcontrol.hxx>
 #include <vcl/toolbox.hxx>
 
 CharmapPopup::CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index cd464d751525..6d90be8af234 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <sfx2/checkin.hxx>
+#include <checkin.hxx>
 
 SfxCheckinDialog::SfxCheckinDialog(weld::Window* pParent)
     : GenericDialogController( pParent, "sfx/ui/checkin.ui", "CheckinDialog")
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index a0b7cb6b13f4..a4e4381ab179 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -82,7 +82,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/checkin.hxx>
+#include <checkin.hxx>
 #include <sfx2/infobar.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index c5e2d204e303..2fc118bfb37b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -25,9 +25,9 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/templatelocalview.hxx>
-#include <sfx2/templatecontaineritem.hxx>
-#include <sfx2/templateviewitem.hxx>
-#include <sfx2/thumbnailviewitem.hxx>
+#include <templatecontaineritem.hxx>
+#include <templateviewitem.hxx>
+#include <thumbnailviewitem.hxx>
 #include <sot/storage.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/langhelp.hxx>
diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx
index 4df92e8916e1..0f681cbdd152 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEWITEM_HXX
 #define INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEWITEM_HXX
 
-#include <sfx2/templateviewitem.hxx>
+#include <templateviewitem.hxx>
 
 struct TemplateSearchViewItem : public TemplateViewItem
 {
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index 13d0c6da3983..acbc65a7efca 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -22,7 +22,7 @@
 #include <vcl/notebookbar.hxx>
 #include <vcl/tabpage.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/notebookbar/NotebookbarTabControl.hxx>
+#include <notebookbar/NotebookbarTabControl.hxx>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index bae5ac590cd6..8eb264f39085 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/Accessible.hxx>
+#include <sidebar/Accessible.hxx>
 
 using namespace css;
 using namespace css::uno;
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index f6343d1c795b..c92fbf59e812 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/AccessibleTitleBar.hxx>
-#include <sfx2/sidebar/Accessible.hxx>
-#include <sfx2/sidebar/TitleBar.hxx>
+#include <sidebar/AccessibleTitleBar.hxx>
+#include <sidebar/Accessible.hxx>
+#include <sidebar/TitleBar.hxx>
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 2d77cd7a4c47..36e9872d3d0b 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <sfx2/sidebar/ContextList.hxx>
+#include <sidebar/ContextList.hxx>
 #include <sfx2/sidebar/Context.hxx>
 
 namespace sfx2::sidebar {
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index de5e8123ddf3..5e4d03ac3c0a 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -18,8 +18,8 @@
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
 
-#include <sfx2/sidebar/MenuButton.hxx>
-#include <sfx2/sidebar/TabItem.hxx>
+#include <sidebar/MenuButton.hxx>
+#include <sidebar/TabItem.hxx>
 
 namespace sfx2::sidebar {
 
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 98d39395d26b..54fc5b774674 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/ControllerFactory.hxx>
+#include <sidebar/ControllerFactory.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 
 #include <com/sun/star/frame/XToolbarController.hpp>
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0967468e3879..d5910704d50e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -18,12 +18,12 @@
  */
 
 #include <sfx2/sidebar/Deck.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/DeckLayouter.hxx>
-#include <sfx2/sidebar/DrawHelper.hxx>
-#include <sfx2/sidebar/DeckTitleBar.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckLayouter.hxx>
+#include <sidebar/DrawHelper.hxx>
+#include <sidebar/DeckTitleBar.hxx>
+#include <sidebar/PanelTitleBar.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx
index 0f38e335dca2..79bb3afdab54 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckDescriptor.hxx>
 
 namespace sfx2::sidebar {
 
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index e96a068a2b5f..49a57bf4d8ba 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/DeckLayouter.hxx>
+#include <sidebar/DeckLayouter.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/Panel.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sidebar/Deck.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 8ba8c95bd627..4c2f833a4f0a 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/DeckTitleBar.hxx>
+#include <sidebar/DeckTitleBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
diff --git a/sfx2/source/sidebar/DrawHelper.cxx b/sfx2/source/sidebar/DrawHelper.cxx
index 9b5c16bc6c3f..4c9f193ba21f 100644
--- a/sfx2/source/sidebar/DrawHelper.cxx
+++ b/sfx2/source/sidebar/DrawHelper.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/DrawHelper.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/DrawHelper.hxx>
+#include <sidebar/Paint.hxx>
 
 #include <tools/svborder.hxx>
 
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index d39c26d70820..4a5140c1ae17 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -19,9 +19,9 @@
 
 #include <sfx2/sidebar/FocusManager.hxx>
 #include <sfx2/sidebar/Panel.hxx>
-#include <sfx2/sidebar/DeckTitleBar.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
-#include <sfx2/sidebar/TitleBar.hxx>
+#include <sidebar/DeckTitleBar.hxx>
+#include <sidebar/PanelTitleBar.hxx>
+#include <sidebar/TitleBar.hxx>
 #include <vcl/button.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 76ab0dc162e0..36be7fcfc2e3 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/MenuButton.hxx>
+#include <sidebar/MenuButton.hxx>
 
-#include <sfx2/sidebar/DrawHelper.hxx>
+#include <sidebar/DrawHelper.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <vcl/event.hxx>
 
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 9c6e7344c96b..a3f4012eab66 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <com/sun/star/awt/Gradient.hpp>
 
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index c1d98be5f36f..85b6ebf14d3e 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <sfx2/sidebar/Panel.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelDescriptor.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 
 #include <sfx2/sidebar/SidebarController.hxx>
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx
index 853d2c445ff5..bdbec773fcdc 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelDescriptor.hxx>
 
 namespace sfx2::sidebar {
 
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index deb501e43d07..78bd8bbe4123 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/ControllerFactory.hxx>
+#include <sidebar/ControllerFactory.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <vcl/event.hxx>
 #include <vcl/image.hxx>
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 455ddcf14fb4..50da0dc46d54 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
+#include <sidebar/DeckDescriptor.hxx>
+#include <sidebar/PanelDescriptor.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index eea91f9b9dad..6f205389e166 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -20,7 +20,7 @@
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelDescriptor.hxx>
 
 using namespace css;
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 462b17051b06..c56c6ed9e2c2 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -18,11 +18,11 @@
  */
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/Deck.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/DeckTitleBar.hxx>
+#include <sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckTitleBar.hxx>
 #include <sfx2/sidebar/Panel.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sidebar/TabBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index fe4548655c81..b74b96d79932 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -19,7 +19,7 @@
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelDescriptor.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <sfx2/lokhelper.hxx>
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 70be2424f276..ca3d076fb414 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/sidebar/SidebarToolBox.hxx>
-#include <sfx2/sidebar/ControllerFactory.hxx>
+#include <sidebar/ControllerFactory.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <vcl/commandinfoprovider.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 61b2f6559b46..62fa64aa86d5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -19,8 +19,8 @@
 
 #include <sfx2/sidebar/TabBar.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/DeckDescriptor.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index 013ff688d19c..e37f028d8b47 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/TabItem.hxx>
+#include <sidebar/TabItem.hxx>
 
-#include <sfx2/sidebar/DrawHelper.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/DrawHelper.hxx>
+#include <sidebar/Paint.hxx>
 
 #include <sfx2/sidebar/Theme.hxx>
 #include <vcl/event.hxx>
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 51d55f067fc1..62c440807f63 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/Paint.hxx>
+#include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/app.hxx>
 
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index b793d3a879fd..40627a6c2353 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/TitleBar.hxx>
-#include <sfx2/sidebar/Paint.hxx>
-#include <sfx2/sidebar/AccessibleTitleBar.hxx>
+#include <sidebar/TitleBar.hxx>
+#include <sidebar/Paint.hxx>
+#include <sidebar/AccessibleTitleBar.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 9a77c064b3e3..122afbe018a2 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -8,15 +8,15 @@
  *
  */
 
-#include <sfx2/sidebar/UnoDeck.hxx>
+#include <sidebar/UnoDeck.hxx>
 
-#include <sfx2/sidebar/UnoPanels.hxx>
+#include <sidebar/UnoPanels.hxx>
 
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/DeckTitleBar.hxx>
+#include <sidebar/DeckTitleBar.hxx>
 #include <sfx2/sidebar/Deck.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckDescriptor.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/sidebar/UnoDecks.cxx b/sfx2/source/sidebar/UnoDecks.cxx
index 915a0656ae69..9b3ad8999784 100644
--- a/sfx2/source/sidebar/UnoDecks.cxx
+++ b/sfx2/source/sidebar/UnoDecks.cxx
@@ -11,8 +11,8 @@
 #include <sal/config.h>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <sfx2/sidebar/UnoDecks.hxx>
-#include <sfx2/sidebar/UnoDeck.hxx>
+#include <sidebar/UnoDecks.hxx>
+#include <sidebar/UnoDeck.hxx>
 
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx
index 83fb45dd7842..eee70429aa30 100644
--- a/sfx2/source/sidebar/UnoPanel.cxx
+++ b/sfx2/source/sidebar/UnoPanel.cxx
@@ -8,16 +8,16 @@
  *
  */
 
-#include <sfx2/sidebar/UnoPanel.hxx>
+#include <sidebar/UnoPanel.hxx>
 
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 
-#include <sfx2/sidebar/PanelDescriptor.hxx>
-#include <sfx2/sidebar/PanelTitleBar.hxx>
+#include <sidebar/PanelDescriptor.hxx>
+#include <sidebar/PanelTitleBar.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Deck.hxx>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
+#include <sidebar/DeckDescriptor.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx
index 07d3c2455e4b..1bc0ded10ecd 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -8,14 +8,14 @@
  *
  */
 
-#include <sfx2/sidebar/UnoPanels.hxx>
+#include <sidebar/UnoPanels.hxx>
 
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/ui/XPanel.hpp>
-#include <sfx2/sidebar/UnoPanel.hxx>
+#include <sidebar/UnoPanel.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx
index 812fe9c877ea..dcd8d6ee8f3e 100644
--- a/sfx2/source/sidebar/UnoSidebar.cxx
+++ b/sfx2/source/sidebar/UnoSidebar.cxx
@@ -12,7 +12,7 @@
 #include <sfx2/sidebar/Tools.hxx>
 
 #include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/UnoDecks.hxx>
+#include <sidebar/UnoDecks.hxx>
 
 #include <com/sun/star/frame/XDispatch.hpp>
 
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 45590eeb72bc..70e8248b579d 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -38,7 +38,7 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/objsh.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index d362cc9d37c9..723e28000089 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -56,7 +56,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <ctrlfactoryimpl.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/toolbox/weldutils.cxx b/sfx2/source/toolbox/weldutils.cxx
index 281b7594660a..3b16543242aa 100644
--- a/sfx2/source/toolbox/weldutils.cxx
+++ b/sfx2/source/toolbox/weldutils.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <com/sun/star/frame/XSubToolbarController.hpp>
-#include <sfx2/sidebar/ControllerFactory.hxx>
+#include <sidebar/ControllerFactory.hxx>
 #include <sfx2/weldutils.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/settings.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 28c41a714b0c..3d25070a0b08 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -50,7 +50,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/userinputinterception.hxx>
 
-#include <sfx2/unoctitm.hxx>
+#include <unoctitm.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/sfxresid.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 8ec37780bbfe..2822ad5871cb 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6459,7 +6459,6 @@ include/sfx2/basedlgs.hxx
 include/sfx2/bindings.hxx
 include/sfx2/brokenpackageint.hxx
 include/sfx2/chalign.hxx
-include/sfx2/charmapcontrol.hxx
 include/sfx2/charmappopup.hxx
 include/sfx2/charwin.hxx
 include/sfx2/childwin.hxx
@@ -6477,10 +6476,7 @@ include/sfx2/dockwin.hxx
 include/sfx2/docmacromode.hxx
 include/sfx2/docstoragemodifylistener.hxx
 include/sfx2/doctempl.hxx
-include/sfx2/emojicontrol.hxx
 include/sfx2/emojipopup.hxx
-include/sfx2/emojiview.hxx
-include/sfx2/emojiviewitem.hxx
 include/sfx2/event.hxx
 include/sfx2/evntconf.hxx
 include/sfx2/fcontnr.hxx
@@ -6508,7 +6504,6 @@ include/sfx2/msgpool.hxx
 include/sfx2/navigat.hxx
 include/sfx2/new.hxx
 include/sfx2/newstyle.hxx
-include/sfx2/notebookbar/NotebookbarTabControl.hxx
 include/sfx2/notebookbar/SfxNotebookBar.hxx
 include/sfx2/objface.hxx
 include/sfx2/objitem.hxx
@@ -6519,7 +6514,6 @@ include/sfx2/passwd.hxx
 include/sfx2/printer.hxx
 include/sfx2/printopt.hxx
 include/sfx2/progress.hxx
-include/sfx2/recentdocsview.hxx
 include/sfx2/request.hxx
 include/sfx2/safemode.hxx
 include/sfx2/sfxbasecontroller.hxx
@@ -6531,27 +6525,15 @@ include/sfx2/sfxmodelfactory.hxx
 include/sfx2/sfxstatuslistener.hxx
 include/sfx2/sfxuno.hxx
 include/sfx2/shell.hxx
-include/sfx2/sidebar/Accessible.hxx
-include/sfx2/sidebar/AccessibleTitleBar.hxx
 include/sfx2/sidebar/AsynchronousCall.hxx
 include/sfx2/sidebar/Context.hxx
-include/sfx2/sidebar/ContextList.hxx
 include/sfx2/sidebar/ControlFactory.hxx
-include/sfx2/sidebar/ControllerFactory.hxx
 include/sfx2/sidebar/ControllerItem.hxx
 include/sfx2/sidebar/Deck.hxx
-include/sfx2/sidebar/DeckDescriptor.hxx
-include/sfx2/sidebar/DeckLayouter.hxx
-include/sfx2/sidebar/DeckTitleBar.hxx
-include/sfx2/sidebar/DrawHelper.hxx
 include/sfx2/sidebar/FocusManager.hxx
 include/sfx2/sidebar/IContextChangeReceiver.hxx
 include/sfx2/sidebar/ILayoutableWindow.hxx
-include/sfx2/sidebar/MenuButton.hxx
-include/sfx2/sidebar/Paint.hxx
 include/sfx2/sidebar/Panel.hxx
-include/sfx2/sidebar/PanelDescriptor.hxx
-include/sfx2/sidebar/PanelTitleBar.hxx
 include/sfx2/sidebar/ResourceManager.hxx
 include/sfx2/sidebar/Sidebar.hxx
 include/sfx2/sidebar/SidebarChildWindow.hxx
@@ -6561,14 +6543,8 @@ include/sfx2/sidebar/SidebarModelUpdate.hxx
 include/sfx2/sidebar/SidebarPanelBase.hxx
 include/sfx2/sidebar/SidebarToolBox.hxx
 include/sfx2/sidebar/TabBar.hxx
-include/sfx2/sidebar/TabItem.hxx
 include/sfx2/sidebar/Theme.hxx
-include/sfx2/sidebar/TitleBar.hxx
 include/sfx2/sidebar/Tools.hxx
-include/sfx2/sidebar/UnoDeck.hxx
-include/sfx2/sidebar/UnoDecks.hxx
-include/sfx2/sidebar/UnoPanel.hxx
-include/sfx2/sidebar/UnoPanels.hxx
 include/sfx2/sidebar/UnoSidebar.hxx
 include/sfx2/signaturestate.hxx
 include/sfx2/stbitem.hxx
@@ -6576,18 +6552,13 @@ include/sfx2/styfitem.hxx
 include/sfx2/styledlg.hxx
 include/sfx2/tabdlg.hxx
 include/sfx2/tbxctrl.hxx
-include/sfx2/templatecontaineritem.hxx
-include/sfx2/templatedefaultview.hxx
 include/sfx2/templatedlg.hxx
 include/sfx2/templatelocalview.hxx
 include/sfx2/templateproperties.hxx
-include/sfx2/templateviewitem.hxx
 include/sfx2/templdlg.hxx
 include/sfx2/thumbnailview.hxx
-include/sfx2/thumbnailviewitem.hxx
 include/sfx2/titledockwin.hxx
 include/sfx2/tplpitem.hxx
-include/sfx2/unoctitm.hxx
 include/sfx2/userinputinterception.hxx
 include/sfx2/viewfac.hxx
 include/sfx2/viewfrm.hxx
@@ -12160,15 +12131,44 @@ setup_native/source/win32/customactions/tools/seterror.hxx
 sfx2/inc/arrdecl.hxx
 sfx2/inc/bitset.hxx
 sfx2/inc/bluthsndapi.hxx
+sfx2/inc/charmapcontrol.hxx
+sfx2/inc/emojicontrol.hxx
+sfx2/inc/emojiview.hxx
+sfx2/inc/emojiviewitem.hxx
 sfx2/inc/fwkhelper.hxx
 sfx2/inc/guisaveas.hxx
 sfx2/inc/inettbc.hxx
 sfx2/inc/preventduplicateinteraction.hxx
+sfx2/inc/recentdocsview.hxx
 sfx2/inc/sfxbasecontroller_internal.hxx
+sfx2/inc/notebookbar/NotebookbarTabControl.hxx
+sfx2/inc/sidebar/Accessible.hxx
+sfx2/inc/sidebar/AccessibleTitleBar.hxx
+sfx2/inc/sidebar/ContextList.hxx
 sfx2/inc/sidebar/ContextChangeBroadcaster.hxx
+sfx2/inc/sidebar/ControllerFactory.hxx
+sfx2/inc/sidebar/DeckDescriptor.hxx
+sfx2/inc/sidebar/DeckLayouter.hxx
+sfx2/inc/sidebar/DeckTitleBar.hxx
+sfx2/inc/sidebar/DrawHelper.hxx
+sfx2/inc/sidebar/MenuButton.hxx
+sfx2/inc/sidebar/Paint.hxx
+sfx2/inc/sidebar/PanelDescriptor.hxx
+sfx2/inc/sidebar/PanelTitleBar.hxx
+sfx2/inc/sidebar/TabItem.hxx
+sfx2/inc/sidebar/TitleBar.hxx
+sfx2/inc/sidebar/UnoDeck.hxx
+sfx2/inc/sidebar/UnoDecks.hxx
+sfx2/inc/sidebar/UnoPanel.hxx
+sfx2/inc/sidebar/UnoPanels.hxx
 sfx2/inc/sorgitm.hxx
 sfx2/inc/srchdlg.hxx
 sfx2/inc/strings.hxx
+sfx2/inc/templatecontaineritem.hxx
+sfx2/inc/templatedefaultview.hxx
+sfx2/inc/templateviewitem.hxx
+sfx2/inc/thumbnailviewitem.hxx
+sfx2/inc/unoctitm.hxx
 sfx2/qa/cppunit/test_classification.cxx
 sfx2/qa/cppunit/test_controlleritem.cxx
 sfx2/qa/cppunit/test_metadatable.cxx