core.git: canvas/inc canvas/source cui/inc cui/source drawinglayer/source include/vcl oox/source sd/source svgio/source svx/inc svx/source vcl/inc vcl/qa vcl/source vcl/unx vcl/workben

Mon, 21 Oct 2024 00:45:50 -0700 

 canvas/inc/pch/precompiled_vclcanvas.hxx                    |   11 +-
 canvas/source/vcl/canvashelper.cxx                          |    2 
 cui/inc/pch/precompiled_cui.hxx                             |   26 +++---
 cui/source/dialogs/cuigrfflt.cxx                            |   14 +--
 drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx |    6 -
 include/vcl/bitmap/BitmapAlphaClampFilter.hxx               |    2 
 include/vcl/bitmap/BitmapArithmeticBlendFilter.hxx          |    7 -
 include/vcl/bitmap/BitmapBasicMorphologyFilter.hxx          |    9 --
 include/vcl/bitmap/BitmapColorQuantizationFilter.hxx        |    7 -
 include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx        |    2 
 include/vcl/bitmap/BitmapDarkenBlendFilter.hxx              |    5 -
 include/vcl/bitmap/BitmapDuoToneFilter.hxx                  |    7 -
 include/vcl/bitmap/BitmapEmbossGreyFilter.hxx               |    9 --
 include/vcl/bitmap/BitmapFilter.hxx                         |    5 -
 include/vcl/bitmap/BitmapFilterStackBlur.hxx                |    4 
 include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx    |    8 -
 include/vcl/bitmap/BitmapLightenBlendFilter.hxx             |    5 -
 include/vcl/bitmap/BitmapMedianFilter.hxx                   |    7 -
 include/vcl/bitmap/BitmapMonochromeFilter.hxx               |    7 -
 include/vcl/bitmap/BitmapMosaicFilter.hxx                   |   11 --
 include/vcl/bitmap/BitmapMultiplyBlendFilter.hxx            |    5 -
 include/vcl/bitmap/BitmapNormalBlendFilter.hxx              |    5 -
 include/vcl/bitmap/BitmapPopArtFilter.hxx                   |    7 -
 include/vcl/bitmap/BitmapScreenBlendFilter.hxx              |    5 -
 include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx       |    7 -
 include/vcl/bitmap/BitmapSepiaFilter.hxx                    |    7 -
 include/vcl/bitmap/BitmapShadowFilter.hxx                   |    2 
 include/vcl/bitmap/BitmapSharpenFilter.hxx                  |    7 -
 include/vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx  |    7 -
 include/vcl/bitmap/BitmapSmoothenFilter.hxx                 |    7 -
 include/vcl/bitmap/BitmapSobelGreyFilter.hxx                |    7 -
 include/vcl/bitmap/BitmapSolarizeFilter.hxx                 |    7 -
 oox/source/drawingml/fillproperties.cxx                     |    3 
 sd/source/ui/dlg/vectdlg.cxx                                |    2 
 svgio/source/svgreader/svgfeblendnode.cxx                   |   11 +-
 svgio/source/svgreader/svgfecompositenode.cxx               |    3 
 svx/inc/pch/precompiled_svx.hxx                             |   42 +++++-----
 svx/source/dialog/grfflt.cxx                                |    8 -
 svx/source/svdraw/svdoashp.cxx                              |    2 
 vcl/inc/bitmap/BitmapColorizeFilter.hxx                     |    3 
 vcl/inc/bitmap/BitmapDisabledImageFilter.hxx                |    2 
 vcl/inc/bitmap/BitmapFastScaleFilter.hxx                    |    3 
 vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx             |    3 
 vcl/inc/bitmap/BitmapLightenFilter.hxx                      |    2 
 vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx                  |    2 
 vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx             |    2 
 vcl/inc/bitmap/BitmapScaleSuperFilter.hxx                   |    2 
 vcl/inc/pch/precompiled_vcl.hxx                             |   49 +++++-------
 vcl/qa/cppunit/BitmapFilterTest.cxx                         |   23 ++---
 vcl/qa/cppunit/BitmapTest.cxx                               |    5 -
 vcl/qa/cppunit/png/PngFilterTest.cxx                        |    3 
 vcl/source/animate/Animation.cxx                            |    4 
 vcl/source/bitmap/BitmapAlphaClampFilter.cxx                |    3 
 vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx           |    3 
 vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx           |    5 -
 vcl/source/bitmap/BitmapColorQuantizationFilter.cxx         |    4 
 vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx         |    6 -
 vcl/source/bitmap/BitmapDarkenBlendFilter.cxx               |    3 
 vcl/source/bitmap/BitmapDuoToneFilter.cxx                   |    4 
 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx                |    4 
 vcl/source/bitmap/BitmapEx.cxx                              |    2 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx                 |    6 -
 vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx     |    4 
 vcl/source/bitmap/BitmapLightenBlendFilter.cxx              |    3 
 vcl/source/bitmap/BitmapMedianFilter.cxx                    |    4 
 vcl/source/bitmap/BitmapMonochromeFilter.cxx                |    4 
 vcl/source/bitmap/BitmapMosaicFilter.cxx                    |    4 
 vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx             |    3 
 vcl/source/bitmap/BitmapNormalBlendFilter.cxx               |    3 
 vcl/source/bitmap/BitmapPopArtFilter.cxx                    |    5 -
 vcl/source/bitmap/BitmapScreenBlendFilter.cxx               |    3 
 vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx        |    6 -
 vcl/source/bitmap/BitmapSepiaFilter.cxx                     |    4 
 vcl/source/bitmap/BitmapShadowFilter.cxx                    |    3 
 vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx   |    4 
 vcl/source/bitmap/BitmapSmoothenFilter.cxx                  |    7 -
 vcl/source/bitmap/BitmapSobelGreyFilter.cxx                 |    4 
 vcl/source/bitmap/BitmapSolarizeFilter.cxx                  |    4 
 vcl/source/bitmap/bitmap.cxx                                |    2 
 vcl/source/bitmap/bitmapfilter.cxx                          |    6 -
 vcl/source/graphic/UnoGraphic.cxx                           |    2 
 vcl/source/image/ImplImage.cxx                              |   10 +-
 vcl/source/rendercontext/drawmode.cxx                       |    2 
 vcl/unx/generic/dtrans/bmp.cxx                              |    2 
 vcl/workben/vcldemo.cxx                                     |    2 
 85 files changed, 217 insertions(+), 315 deletions(-)

New commits:
commit bc2ff9daf5d20bc9b8f260ffc59e820a1aa08772
Author:     Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Sep 15 00:02:10 2024 +1000
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Oct 21 09:45:21 2024 +0200

    vcl: move bitmap filter headers into vcl/bitmap global header directory
    
    Use #pragma once instead of header guards
    
    Change-Id: Iba43f2103628ed184933cf2611991e7aef9f0173
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173369
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Jenkins

diff --git a/canvas/inc/pch/precompiled_vclcanvas.hxx 
b/canvas/inc/pch/precompiled_vclcanvas.hxx
index 03c547f2c7b3..d16ad18f0a3e 100644
--- a/canvas/inc/pch/precompiled_vclcanvas.hxx
+++ b/canvas/inc/pch/precompiled_vclcanvas.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-03-08 13:11:36 using:
+ Generated on 2024-10-12 02:56:17 using:
  ./bin/update_pch canvas vclcanvas --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -25,22 +25,22 @@
 #include <cstdlib>
 #include <memory>
 #include <tuple>
+#include <utility>
 #include <boost/cast.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
-#include <rtl/instance.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
-#include <vcl/BitmapAlphaClampFilter.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/alpha.hxx>
+#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/kernarray.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
@@ -76,12 +76,11 @@
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <com/sun/star/rendering/ViewState.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <comphelper/diagnose_ex.hxx>
-#include <tools/long.hxx>
 #include <tools/poly.hxx>
 #include <tools/stream.hxx>
 #endif // PCH_LEVEL >= 3
diff --git a/canvas/source/vcl/canvashelper.cxx 
b/canvas/source/vcl/canvashelper.cxx
index 26c730b851bd..db19111f349c 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -40,7 +40,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/BitmapAlphaClampFilter.hxx>
+#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 
 #include <canvas/canvastools.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 2ff025d34f49..e007aea1cfa3 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2023-07-19 09:21:23 using:
+ Generated on 2024-09-15 00:24:27 using:
  ./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module 
--exclude:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -24,9 +24,11 @@
 #if PCH_LEVEL >= 1
 #include <algorithm>
 #include <array>
+#include <atomic>
 #include <cassert>
 #include <chrono>
 #include <cmath>
+#include <compare>
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
@@ -54,7 +56,6 @@
 #include <string>
 #include <string_view>
 #include <type_traits>
-#include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -98,7 +99,6 @@
 #include <sal/types.h>
 #include <sal/typesizes.h>
 #include <vcl/BinaryDataContainer.hxx>
-#include <vcl/BitmapFilter.hxx>
 #include <vcl/GraphicAttributes.hxx>
 #include <vcl/GraphicExternalLink.hxx>
 #include <vcl/GraphicObject.hxx>
@@ -109,6 +109,7 @@
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 #include <vcl/bitmap/BitmapTypes.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builderpage.hxx>
@@ -116,6 +117,7 @@
 #include <vcl/checksum.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/dllapi.h>
+#include <vcl/dockwin.hxx>
 #include <vcl/event.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
@@ -144,12 +146,14 @@
 #include <vcl/rendercontext/SalLayoutFlags.hxx>
 #include <vcl/rendercontext/State.hxx>
 #include <vcl/rendercontext/SystemTextColorFlags.hxx>
+#include <vcl/salgtype.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/task.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/toolboxid.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/uitest/factory.hxx>
 #include <vcl/vclenum.hxx>
@@ -167,7 +171,6 @@
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/matrix/hommatrixtemplate.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -184,6 +187,7 @@
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/utils/common.hxx>
+#include <basegfx/utils/systemdependentdata.hxx>
 #include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2enums.hxx>
@@ -195,6 +199,7 @@
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -217,7 +222,6 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <com/sun/star/i18n/LanguageCountryInfo.hpp>
@@ -226,13 +230,10 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
+#include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/reservedWords.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/Locale.hpp>
@@ -285,7 +286,6 @@
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <docmodel/color/ComplexColor.hxx>
@@ -298,6 +298,8 @@
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <editeng/EPosition.hxx>
+#include <editeng/ESelection.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editstat.hxx>
@@ -366,7 +368,6 @@
 #include <svtools/svtdllapi.h>
 #include <svtools/unitconv.hxx>
 #include <svtools/valueset.hxx>
-#include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/ipolypolygoneditorcontroller.hxx>
@@ -387,6 +388,7 @@
 #include <svx/svddef.hxx>
 #include <svx/svddrag.hxx>
 #include <svx/svdedtv.hxx>
+#include <svx/svdgeodata.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdhlpln.hxx>
@@ -443,11 +445,11 @@
 #include <uno/data.h>
 #include <uno/sequence2.h>
 #include <unotools/fontdefs.hxx>
+#include <unotools/localedatawrapper.hxx>
 #include <unotools/options.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
-#include <unotools/tempfile.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <unotools/weakref.hxx>
 #endif // PCH_LEVEL >= 3
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 3522fa200e05..9f9d9273b5f2 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/BitmapMosaicFilter.hxx>
-#include <vcl/BitmapSharpenFilter.hxx>
-#include <vcl/BitmapEmbossGreyFilter.hxx>
-#include <vcl/BitmapSepiaFilter.hxx>
-#include <vcl/BitmapSmoothenFilter.hxx>
-#include <vcl/BitmapSolarizeFilter.hxx>
-#include <vcl/BitmapColorQuantizationFilter.hxx>
+#include <vcl/bitmap/BitmapMosaicFilter.hxx>
+#include <vcl/bitmap/BitmapSharpenFilter.hxx>
+#include <vcl/bitmap/BitmapEmbossGreyFilter.hxx>
+#include <vcl/bitmap/BitmapSepiaFilter.hxx>
+#include <vcl/bitmap/BitmapSmoothenFilter.hxx>
+#include <vcl/bitmap/BitmapSolarizeFilter.hxx>
+#include <vcl/bitmap/BitmapColorQuantizationFilter.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
diff --git a/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx 
b/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
index e1dcac421344..1a8d22b10f31 100644
--- a/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
+++ b/drawinglayer/source/primitive2d/GlowSoftEgdeShadowTools.cxx
@@ -18,10 +18,8 @@
  */
 
 #include "GlowSoftEgdeShadowTools.hxx"
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapFilter.hxx>
-#include <vcl/BitmapBasicMorphologyFilter.hxx>
-#include <vcl/BitmapFilterStackBlur.hxx>
+#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx>
+#include <vcl/bitmap/BitmapFilterStackBlur.hxx>
 
 namespace drawinglayer::primitive2d
 {
diff --git a/include/vcl/BitmapAlphaClampFilter.hxx 
b/include/vcl/bitmap/BitmapAlphaClampFilter.hxx
similarity index 95%
rename from include/vcl/BitmapAlphaClampFilter.hxx
rename to include/vcl/bitmap/BitmapAlphaClampFilter.hxx
index 21163862af4c..5eab99e5d1f2 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/bitmap/BitmapAlphaClampFilter.hxx
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 /** If the alpha is beyond a certain threshold, make it fully transparent
  */
diff --git a/include/vcl/BitmapArithmeticBlendFilter.hxx 
b/include/vcl/bitmap/BitmapArithmeticBlendFilter.hxx
similarity index 84%
rename from include/vcl/BitmapArithmeticBlendFilter.hxx
rename to include/vcl/bitmap/BitmapArithmeticBlendFilter.hxx
index e63f838e65f4..954e49f7ebb0 100644
--- a/include/vcl/BitmapArithmeticBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapArithmeticBlendFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPARITHMETICBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPARITHMETICBLENDFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapArithmeticBlendFilter final : public BitmapFilter
 {
@@ -30,6 +29,4 @@ public:
     BitmapEx execute(BitmapEx const& rBitmapEx) const;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapBasicMorphologyFilter.hxx 
b/include/vcl/bitmap/BitmapBasicMorphologyFilter.hxx
similarity index 87%
rename from include/vcl/BitmapBasicMorphologyFilter.hxx
rename to include/vcl/bitmap/BitmapBasicMorphologyFilter.hxx
index 055e1e14e637..5388d91729bd 100644
--- a/include/vcl/BitmapBasicMorphologyFilter.hxx
+++ b/include/vcl/bitmap/BitmapBasicMorphologyFilter.hxx
@@ -8,12 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
-#define INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
+#pragma once
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 enum class BasicMorphologyOp
 {
@@ -66,6 +63,4 @@ public:
     }
 };
 
-#endif // INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx 
b/include/vcl/bitmap/BitmapColorQuantizationFilter.hxx
similarity index 85%
rename from include/vcl/BitmapColorQuantizationFilter.hxx
rename to include/vcl/bitmap/BitmapColorQuantizationFilter.hxx
index 266a384a3cf8..920d6fe6f72f 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/bitmap/BitmapColorQuantizationFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
-#define INCLUDED_INCLUDE_VCL_BITMAPCOLORQUANTIZATIONFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapColorQuantizationFilter final : public BitmapFilter
 {
@@ -38,6 +37,4 @@ private:
     };
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapConvolutionMatrixFilter.hxx 
b/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
similarity index 95%
rename from include/vcl/BitmapConvolutionMatrixFilter.hxx
rename to include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
index 34b0b03c8ad5..71bab0eb5067 100644
--- a/include/vcl/BitmapConvolutionMatrixFilter.hxx
+++ b/include/vcl/bitmap/BitmapConvolutionMatrixFilter.hxx
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
diff --git a/include/vcl/BitmapDarkenBlendFilter.hxx 
b/include/vcl/bitmap/BitmapDarkenBlendFilter.hxx
similarity index 86%
rename from include/vcl/BitmapDarkenBlendFilter.hxx
rename to include/vcl/bitmap/BitmapDarkenBlendFilter.hxx
index d8379d12fa45..541ff1af22e5 100644
--- a/include/vcl/BitmapDarkenBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapDarkenBlendFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPDARKENBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPDARKENBLENDFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 
@@ -25,5 +24,5 @@ public:
     ~BitmapDarkenBlendFilter();
     BitmapEx execute();
 };
-#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapDuoToneFilter.hxx 
b/include/vcl/bitmap/BitmapDuoToneFilter.hxx
similarity index 85%
rename from include/vcl/BitmapDuoToneFilter.hxx
rename to include/vcl/bitmap/BitmapDuoToneFilter.hxx
index 27ade1cb297f..abb0b8eeed88 100644
--- a/include/vcl/BitmapDuoToneFilter.hxx
+++ b/include/vcl/bitmap/BitmapDuoToneFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPDUOTONEFILTER_HXX
-#define INCLUDED_VCL_BITMAPDUOTONEFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -31,6 +30,4 @@ private:
     Color mnColorTwo;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapEmbossGreyFilter.hxx 
b/include/vcl/bitmap/BitmapEmbossGreyFilter.hxx
similarity index 84%
rename from include/vcl/BitmapEmbossGreyFilter.hxx
rename to include/vcl/bitmap/BitmapEmbossGreyFilter.hxx
index 34d9b5bb8c10..cde388a76fcb 100644
--- a/include/vcl/BitmapEmbossGreyFilter.hxx
+++ b/include/vcl/bitmap/BitmapEmbossGreyFilter.hxx
@@ -8,15 +8,12 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPEMBOSSGREYFILTER_HXX
-#define INCLUDED_VCL_BITMAPEMBOSSGREYFILTER_HXX
+#pragma once
 
 #include <sal/config.h>
 
 #include <tools/degree.hxx>
-#include <vcl/BitmapFilter.hxx>
-
-class BitmapEx;
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapEmbossGreyFilter final : public BitmapFilter
 {
@@ -34,6 +31,4 @@ private:
     Degree100 mnElevationAngle;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/bitmap/BitmapFilter.hxx
similarity index 94%
rename from include/vcl/BitmapFilter.hxx
rename to include/vcl/bitmap/BitmapFilter.hxx
index c19d83b2d507..f6a57cd46646 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/bitmap/BitmapFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPFILTER_HXX
-#define INCLUDED_VCL_BITMAPFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 #include <functional>
@@ -55,6 +54,4 @@ public:
     static bool Filter(Animation& rBmpEx, BitmapFilter const& rFilter);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapFilterStackBlur.hxx 
b/include/vcl/bitmap/BitmapFilterStackBlur.hxx
similarity index 90%
rename from include/vcl/BitmapFilterStackBlur.hxx
rename to include/vcl/bitmap/BitmapFilterStackBlur.hxx
index 2fdb78b0b1af..ffd8f200b0a2 100644
--- a/include/vcl/BitmapFilterStackBlur.hxx
+++ b/include/vcl/bitmap/BitmapFilterStackBlur.hxx
@@ -11,9 +11,7 @@
 #ifndef INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
 #define INCLUDED_VCL_BITMAPFILTERSTACKBLUR_HXX
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapFilterStackBlur final : public BitmapFilter
 {
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx 
b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
similarity index 91%
rename from include/vcl/BitmapGaussianSeparableBlurFilter.hxx
rename to include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
index 72b3fdb81f1d..e4e8e944b21b 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx
@@ -8,10 +8,10 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPGAUSSIANSEPARABLEBLURFILTER_HXX
-#define INCLUDED_VCL_BITMAPGAUSSIANSEPARABLEBLURFILTER_HXX
+#pragma once
+
+#include <vcl/bitmap/BitmapFilter.hxx>
 
-#include <vcl/BitmapFilter.hxx>
 #include <vector>
 
 class BitmapEx;
@@ -47,6 +47,4 @@ private:
                                   std::vector<int>& rCounts);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapLightenBlendFilter.hxx 
b/include/vcl/bitmap/BitmapLightenBlendFilter.hxx
similarity index 86%
rename from include/vcl/BitmapLightenBlendFilter.hxx
rename to include/vcl/bitmap/BitmapLightenBlendFilter.hxx
index dc44ae24dbbb..546f98f3a720 100644
--- a/include/vcl/BitmapLightenBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapLightenBlendFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPLIGHTENBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPLIGHTENBLENDFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 
@@ -25,5 +24,5 @@ public:
     ~BitmapLightenBlendFilter();
     BitmapEx execute();
 };
-#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapMedianFilter.hxx 
b/include/vcl/bitmap/BitmapMedianFilter.hxx
similarity index 82%
rename from include/vcl/BitmapMedianFilter.hxx
rename to include/vcl/bitmap/BitmapMedianFilter.hxx
index 941ba0dae5d2..8842f8cf6bb3 100644
--- a/include/vcl/BitmapMedianFilter.hxx
+++ b/include/vcl/bitmap/BitmapMedianFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPMEDIANFILTER_HXX
-#define INCLUDED_VCL_BITMAPMEDIANFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -23,6 +22,4 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapMonochromeFilter.hxx 
b/include/vcl/bitmap/BitmapMonochromeFilter.hxx
similarity index 87%
rename from include/vcl/BitmapMonochromeFilter.hxx
rename to include/vcl/bitmap/BitmapMonochromeFilter.hxx
index 81a505e1f7b8..058fbe9e7485 100644
--- a/include/vcl/BitmapMonochromeFilter.hxx
+++ b/include/vcl/bitmap/BitmapMonochromeFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
-#define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapMonochromeFilter final : public BitmapFilter
 {
@@ -38,6 +37,4 @@ private:
     sal_uInt8 mcThreshold;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapMosaicFilter.hxx 
b/include/vcl/bitmap/BitmapMosaicFilter.hxx
similarity index 85%
rename from include/vcl/BitmapMosaicFilter.hxx
rename to include/vcl/bitmap/BitmapMosaicFilter.hxx
index 92a5afda4c09..8b8636a88ee6 100644
--- a/include/vcl/BitmapMosaicFilter.hxx
+++ b/include/vcl/bitmap/BitmapMosaicFilter.hxx
@@ -8,16 +8,13 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPMOSAICFILTER_HXX
-#define INCLUDED_VCL_BITMAPMOSAICFILTER_HXX
+#pragma once
 
 #include <sal/config.h>
 
-#include <algorithm>
-
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
-class BitmapEx;
+#include <algorithm>
 
 class VCL_DLLPUBLIC BitmapMosaicFilter final : public BitmapFilter
 {
@@ -35,6 +32,4 @@ private:
     sal_Int32 mnTileHeight;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapMultiplyBlendFilter.hxx 
b/include/vcl/bitmap/BitmapMultiplyBlendFilter.hxx
similarity index 86%
rename from include/vcl/BitmapMultiplyBlendFilter.hxx
rename to include/vcl/bitmap/BitmapMultiplyBlendFilter.hxx
index e720b8a6670e..a8b4c8248d7b 100644
--- a/include/vcl/BitmapMultiplyBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapMultiplyBlendFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPMULTIPLYBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPMULTIPLYBLENDFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 
@@ -25,5 +24,5 @@ public:
     ~BitmapMultiplyBlendFilter();
     BitmapEx execute();
 };
-#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapNormalBlendFilter.hxx 
b/include/vcl/bitmap/BitmapNormalBlendFilter.hxx
similarity index 86%
rename from include/vcl/BitmapNormalBlendFilter.hxx
rename to include/vcl/bitmap/BitmapNormalBlendFilter.hxx
index b7d3919baf33..c3ed2e7465ca 100644
--- a/include/vcl/BitmapNormalBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapNormalBlendFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPNORMALBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPNORMALBLENDFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 
@@ -25,5 +24,5 @@ public:
     ~BitmapNormalBlendFilter();
     BitmapEx execute();
 };
-#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapPopArtFilter.hxx 
b/include/vcl/bitmap/BitmapPopArtFilter.hxx
similarity index 84%
rename from include/vcl/BitmapPopArtFilter.hxx
rename to include/vcl/bitmap/BitmapPopArtFilter.hxx
index c25804d359fb..cd7f7ca30044 100644
--- a/include/vcl/BitmapPopArtFilter.hxx
+++ b/include/vcl/bitmap/BitmapPopArtFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPPOPARTILTER_HXX
-#define INCLUDED_VCL_BITMAPPOPARTILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapPopArtFilter final : public BitmapFilter
 {
@@ -28,6 +27,4 @@ private:
     };
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapScreenBlendFilter.hxx 
b/include/vcl/bitmap/BitmapScreenBlendFilter.hxx
similarity index 86%
rename from include/vcl/BitmapScreenBlendFilter.hxx
rename to include/vcl/bitmap/BitmapScreenBlendFilter.hxx
index 6278bd130363..ccc166e44ae7 100644
--- a/include/vcl/BitmapScreenBlendFilter.hxx
+++ b/include/vcl/bitmap/BitmapScreenBlendFilter.hxx
@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSCREENBLENDFILTER_HXX
-#define INCLUDED_VCL_BITMAPSCREENBLENDFILTER_HXX
+#pragma once
 
 #include <vcl/bitmapex.hxx>
 
@@ -25,5 +24,5 @@ public:
     ~BitmapScreenBlendFilter();
     BitmapEx execute();
 };
-#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSeparableUnsharpenFilter.hxx 
b/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
similarity index 84%
rename from include/vcl/BitmapSeparableUnsharpenFilter.hxx
rename to include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
index 69dcfe3bf9cd..a02db451e8c3 100644
--- a/include/vcl/BitmapSeparableUnsharpenFilter.hxx
+++ b/include/vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSEPARABLEUNSHARPENFILTER_HXX
-#define INCLUDED_VCL_BITMAPSEPARABLEUNSHARPENFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -32,6 +31,4 @@ private:
     double mfRadius;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSepiaFilter.hxx 
b/include/vcl/bitmap/BitmapSepiaFilter.hxx
similarity index 86%
rename from include/vcl/BitmapSepiaFilter.hxx
rename to include/vcl/bitmap/BitmapSepiaFilter.hxx
index 3121987ed06c..8f90e3de6e1e 100644
--- a/include/vcl/BitmapSepiaFilter.hxx
+++ b/include/vcl/bitmap/BitmapSepiaFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSEPIAFILTER_HXX
-#define INCLUDED_VCL_BITMAPSEPIAFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -33,6 +32,4 @@ private:
     sal_uInt16 mnSepiaPercent;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapShadowFilter.hxx 
b/include/vcl/bitmap/BitmapShadowFilter.hxx
similarity index 95%
rename from include/vcl/BitmapShadowFilter.hxx
rename to include/vcl/bitmap/BitmapShadowFilter.hxx
index d4a3207a13b1..51cc91ed3e8c 100644
--- a/include/vcl/BitmapShadowFilter.hxx
+++ b/include/vcl/bitmap/BitmapShadowFilter.hxx
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 /** If the alpha is beyond a certain threshold, make it fully transparent
  */
diff --git a/include/vcl/BitmapSharpenFilter.hxx 
b/include/vcl/bitmap/BitmapSharpenFilter.hxx
similarity index 78%
rename from include/vcl/BitmapSharpenFilter.hxx
rename to include/vcl/bitmap/BitmapSharpenFilter.hxx
index 079e1d418d80..849daf25774d 100644
--- a/include/vcl/BitmapSharpenFilter.hxx
+++ b/include/vcl/bitmap/BitmapSharpenFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSHARPENFILTER_HXX
-#define INCLUDED_VCL_BITMAPSHARPENFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapConvolutionMatrixFilter.hxx>
+#include <vcl/bitmap/BitmapConvolutionMatrixFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapSharpenFilter final : public 
BitmapConvolutionMatrixFilter
 {
@@ -19,6 +18,4 @@ public:
     BitmapSharpenFilter();
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx 
b/include/vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx
similarity index 83%
rename from include/vcl/BitmapSimpleColorQuantizationFilter.hxx
rename to include/vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx
index 7e306e051cd5..86cf3b5fbef0 100644
--- a/include/vcl/BitmapSimpleColorQuantizationFilter.hxx
+++ b/include/vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
-#define INCLUDED_INCLUDE_VCL_BITMAPSIMPLECOLORQUANTIZATIONFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapSimpleColorQuantizationFilter final : public 
BitmapFilter
 {
@@ -32,6 +31,4 @@ private:
     sal_uInt16 mnNewColorCount;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSmoothenFilter.hxx 
b/include/vcl/bitmap/BitmapSmoothenFilter.hxx
similarity index 83%
rename from include/vcl/BitmapSmoothenFilter.hxx
rename to include/vcl/bitmap/BitmapSmoothenFilter.hxx
index 1a002c960d29..a70761b69516 100644
--- a/include/vcl/BitmapSmoothenFilter.hxx
+++ b/include/vcl/bitmap/BitmapSmoothenFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSMOOTHENFILTER_HXX
-#define INCLUDED_VCL_BITMAPSMOOTHENFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -29,6 +28,4 @@ private:
     double mfRadius;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSobelGreyFilter.hxx 
b/include/vcl/bitmap/BitmapSobelGreyFilter.hxx
similarity index 81%
rename from include/vcl/BitmapSobelGreyFilter.hxx
rename to include/vcl/bitmap/BitmapSobelGreyFilter.hxx
index 31e56bf5aeb3..31e03563033e 100644
--- a/include/vcl/BitmapSobelGreyFilter.hxx
+++ b/include/vcl/bitmap/BitmapSobelGreyFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSOBELGREYILTER_HXX
-#define INCLUDED_VCL_BITMAPSOBELGREYILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapSobelGreyFilter final : public BitmapFilter
 {
@@ -21,6 +20,4 @@ public:
     virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/BitmapSolarizeFilter.hxx 
b/include/vcl/bitmap/BitmapSolarizeFilter.hxx
similarity index 84%
rename from include/vcl/BitmapSolarizeFilter.hxx
rename to include/vcl/bitmap/BitmapSolarizeFilter.hxx
index f3e36e10fac5..c47d56cd5856 100644
--- a/include/vcl/BitmapSolarizeFilter.hxx
+++ b/include/vcl/bitmap/BitmapSolarizeFilter.hxx
@@ -8,10 +8,9 @@
  *
  */
 
-#ifndef INCLUDED_VCL_BITMAPSOLARIZEFILTER_HXX
-#define INCLUDED_VCL_BITMAPSOLARIZEFILTER_HXX
+#pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapEx;
 
@@ -29,6 +28,4 @@ private:
     sal_uInt8 mcSolarGreyThreshold;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 061cab065849..3311e4c6770b 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -24,8 +24,7 @@
 #include <comphelper/propertyvalue.hxx>
 #include <drawingml/graphicproperties.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/BitmapFilter.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <docmodel/uno/UnoComplexColor.hxx>
 #include <docmodel/uno/UnoGradientTools.hxx>
 #include <basegfx/utils/gradienttools.hxx>
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 4fc6d1b412ec..3d378b7c8384 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -20,9 +20,9 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/BitmapReadAccess.hxx>
+#include <vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx>
 #include <vcl/bitmap/Vectorizer.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
 #include <vcl/svapp.hxx>
 
 #include <DrawDocShell.hxx>
diff --git a/svgio/source/svgreader/svgfeblendnode.cxx 
b/svgio/source/svgreader/svgfeblendnode.cxx
index fd6bd10ef442..cbd24b5b5d55 100644
--- a/svgio/source/svgreader/svgfeblendnode.cxx
+++ b/svgio/source/svgreader/svgfeblendnode.cxx
@@ -21,14 +21,13 @@
 
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <vcl/bitmapex.hxx>
 #include <drawinglayer/converters.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <vcl/BitmapDarkenBlendFilter.hxx>
-#include <vcl/BitmapLightenBlendFilter.hxx>
-#include <vcl/BitmapMultiplyBlendFilter.hxx>
-#include <vcl/BitmapNormalBlendFilter.hxx>
-#include <vcl/BitmapScreenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapLightenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx>
+#include <vcl/bitmap/BitmapNormalBlendFilter.hxx>
+#include <vcl/bitmap/BitmapScreenBlendFilter.hxx>
 #include <vcl/BitmapTools.hxx>
 
 namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgfecompositenode.cxx 
b/svgio/source/svgreader/svgfecompositenode.cxx
index 9d9b1b2616f2..9ca221e3f16e 100644
--- a/svgio/source/svgreader/svgfecompositenode.cxx
+++ b/svgio/source/svgreader/svgfecompositenode.cxx
@@ -25,8 +25,7 @@
 #include <drawinglayer/processor2d/contourextractor2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapArithmeticBlendFilter.hxx>
+#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx>
 #include <drawinglayer/converters.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index a4e91325d20a..cf0ab52d04ef 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2023-01-10 23:28:52 using:
+ Generated on 2024-10-12 19:40:59 using:
  ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -29,7 +29,6 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdlib>
-#include <deque>
 #include <functional>
 #include <limits.h>
 #include <limits>
@@ -42,6 +41,7 @@
 #include <set>
 #include <span>
 #include <stddef.h>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 #include <type_traits>
@@ -56,11 +56,11 @@
 #include <osl/endian.h>
 #include <osl/file.hxx>
 #include <osl/interlck.h>
+#include <osl/mutex.h>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <rtl/alloc.h>
 #include <rtl/bootstrap.hxx>
-#include <rtl/instance.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
@@ -75,12 +75,12 @@
 #include <sal/saldllapi.h>
 #include <sal/types.h>
 #include <sal/typesizes.h>
-#include <vcl/BitmapFilter.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/Scanline.hxx>
 #include <vcl/alpha.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/commandevent.hxx>
@@ -126,9 +126,10 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/range/b3drange.hxx>
+#include <basegfx/tuple/Size2D.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/vector/b2dsize.hxx>
+#include <basegfx/utils/bgradient.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -136,9 +137,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/awt/GradientStyle.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -164,6 +162,7 @@
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
+#include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -172,6 +171,7 @@
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -188,6 +188,7 @@
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/table/XTable.hpp>
 #include <com/sun/star/text/DefaultNumberingProvider.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/textfield/Type.hpp>
@@ -220,14 +221,16 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/unoimplbase.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
+#include <docmodel/color/ComplexColor.hxx>
+#include <docmodel/dllapi.h>
+#include <docmodel/theme/ColorSet.hxx>
+#include <docmodel/theme/ThemeColorType.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
@@ -235,11 +238,8 @@
 #include <editeng/borderline.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
-#include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
-#include <editeng/editstat.hxx>
-#include <editeng/eedata.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flditem.hxx>
@@ -248,14 +248,10 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/numdef.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
-#include <editeng/overflowingtxt.hxx>
-#include <editeng/paragraphdata.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/svxenum.hxx>
-#include <editeng/svxfont.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/wghtitem.hxx>
@@ -267,6 +263,7 @@
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/string_view.hxx>
+#include <o3tl/temporary.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <o3tl/unit_conversion.hxx>
@@ -305,7 +302,6 @@
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
 #include <svl/metitem.hxx>
 #include <svl/poolitem.hxx>
@@ -315,7 +311,6 @@
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
-#include <svl/undo.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
 #include <svtools/colorcfg.hxx>
@@ -335,10 +330,12 @@
 #include <tools/debug.hxx>
 #include <tools/degree.hxx>
 #include <tools/fldunit.hxx>
+#include <tools/fontenum.hxx>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/helpers.hxx>
+#include <tools/json_writer.hxx>
 #include <tools/link.hxx>
 #include <tools/long.hxx>
 #include <tools/mapunit.hxx>
@@ -349,7 +346,6 @@
 #include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
 #include <tools/urlobj.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/resmgr.hxx>
@@ -396,6 +392,8 @@
 #include <svx/srchdlg.hxx>
 #include <svx/strarray.hxx>
 #include <svx/svddef.hxx>
+#include <svx/svdetc.hxx>
+#include <svx/svdgeodata.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdmodel.hxx>
@@ -406,6 +404,7 @@
 #include <svx/svdorect.hxx>
 #include <svx/svdotable.hxx>
 #include <svx/svdotext.hxx>
+#include <svx/svdoutl.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtext.hxx>
@@ -415,6 +414,7 @@
 #include <svx/svx3ditems.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/ucsubset.hxx>
 #include <svx/unomid.hxx>
 #include <svx/view3d.hxx>
 #include <svx/viewpt3d.hxx>
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 425364fb0498..ebf650d3f088 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/BitmapSharpenFilter.hxx>
-#include <vcl/BitmapMedianFilter.hxx>
-#include <vcl/BitmapSobelGreyFilter.hxx>
-#include <vcl/BitmapPopArtFilter.hxx>
+#include <vcl/bitmap/BitmapSharpenFilter.hxx>
+#include <vcl/bitmap/BitmapMedianFilter.hxx>
+#include <vcl/bitmap/BitmapSobelGreyFilter.hxx>
+#include <vcl/bitmap/BitmapPopArtFilter.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 71fab52bb0ae..1ee318ae3283 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/BitmapShadowFilter.hxx>
+#include <vcl/bitmap/BitmapShadowFilter.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/unoapi.hxx>
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
diff --git a/vcl/inc/bitmap/BitmapColorizeFilter.hxx 
b/vcl/inc/bitmap/BitmapColorizeFilter.hxx
index ae511b322d0c..4dd7d3c0dcc7 100644
--- a/vcl/inc/bitmap/BitmapColorizeFilter.hxx
+++ b/vcl/inc/bitmap/BitmapColorizeFilter.hxx
@@ -11,7 +11,8 @@
 #pragma once
 
 #include <tools/color.hxx>
-#include <vcl/BitmapFilter.hxx>
+
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapColorizeFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx 
b/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx
index e1d9d21a9df7..7591125dd3d8 100644
--- a/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx
+++ b/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPDISABLEDIMAGEFILTER_HXX
 #define INCLUDED_VCL_INC_BITMAP_BITMAPDISABLEDIMAGEFILTER_HXX
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class VCL_DLLPUBLIC BitmapDisabledImageFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapFastScaleFilter.hxx 
b/vcl/inc/bitmap/BitmapFastScaleFilter.hxx
index ab2c14e67180..9d6dc14769e7 100644
--- a/vcl/inc/bitmap/BitmapFastScaleFilter.hxx
+++ b/vcl/inc/bitmap/BitmapFastScaleFilter.hxx
@@ -11,8 +11,7 @@
 #ifndef VCL_INC_BITMAP_BITMAPFASTSCALEFILTER_HXX
 #define VCL_INC_BITMAP_BITMAPFASTSCALEFILTER_HXX
 
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapFastScaleFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx 
b/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx
index 7d17c97d169a..66e309a9746d 100644
--- a/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx
+++ b/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx
@@ -11,8 +11,7 @@
 #ifndef VCL_INC_BITMAP_BITMAPINTERPOLATESCALEFILTER_HXX
 #define VCL_INC_BITMAP_BITMAPINTERPOLATESCALEFILTER_HXX
 
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapInterpolateScaleFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapLightenFilter.hxx 
b/vcl/inc/bitmap/BitmapLightenFilter.hxx
index 98f249328599..541eb29f34da 100644
--- a/vcl/inc/bitmap/BitmapLightenFilter.hxx
+++ b/vcl/inc/bitmap/BitmapLightenFilter.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPLIGHTENFILTER_HXX
 #define INCLUDED_VCL_INC_BITMAP_BITMAPLIGHTENFILTER_HXX
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapLightenFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx 
b/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx
index 355d066846c1..378898191eea 100644
--- a/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx
+++ b/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapMaskToAlphaFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx 
b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
index 1c9bb8e33035..c48cb7bb1610 100644
--- a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
@@ -20,7 +20,7 @@
 #ifndef VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX
 #define VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 #include <ResampleKernel.hxx>
 
diff --git a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx 
b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
index 46c21d8d78a3..172138670795 100644
--- a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX
 #define INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX
 
-#include <vcl/BitmapFilter.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 
 class BitmapScaleSuperFilter final : public BitmapFilter
 {
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index fac11693cfa0..00d156760020 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2023-07-19 09:24:26 using:
+ Generated on 2024-09-15 00:23:48 using:
  ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module 
--include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -28,10 +28,10 @@
 #include <cassert>
 #include <chrono>
 #include <cmath>
+#include <compare>
 #include <cstddef>
-#include <cstdio>
+#include <cstdint>
 #include <cstdlib>
-#include <cstring>
 #include <deque>
 #include <float.h>
 #include <functional>
@@ -50,6 +50,7 @@
 #include <optional>
 #include <ostream>
 #include <set>
+#include <span>
 #include <stddef.h>
 #include <string.h>
 #include <string>
@@ -70,17 +71,14 @@
 #if PCH_LEVEL >= 2
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>
-#include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
 #include <osl/file.h>
 #include <osl/file.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
 #include <osl/module.hxx>
 #include <osl/mutex.h>
 #include <osl/mutex.hxx>
 #include <osl/nlsupport.h>
-#include <osl/security.h>
 #include <osl/signal.h>
 #include <osl/socket.h>
 #include <osl/socket.hxx>
@@ -93,7 +91,6 @@
 #include <rtl/cipher.h>
 #include <rtl/crc.h>
 #include <rtl/digest.h>
-#include <rtl/instance.hxx>
 #include <rtl/locale.h>
 #include <rtl/math.h>
 #include <rtl/math.hxx>
@@ -121,7 +118,6 @@
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
-#include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/numeric/ftools.hxx>
@@ -132,6 +128,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/Range2D.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/Size2D.hxx>
 #include <basegfx/tuple/Tuple2D.hxx>
@@ -140,12 +137,10 @@
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/utils/common.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2enums.hxx>
-#include <basegfx/vector/b2isize.hxx>
 #include <basegfx/vector/b2ivector.hxx>
-#include <vcl/BitmapWriteAccess.hxx>
+#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
@@ -161,11 +156,10 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/i18n/Calendar2.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
+#include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/Locale.hpp>
@@ -173,6 +167,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -183,7 +178,6 @@
 #include <com/sun/star/uno/Type.h>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
@@ -191,17 +185,18 @@
 #include <com/sun/star/uno/genfunc.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <comphelper/base64.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <comphelper/configuration.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <comphelper/errcode.hxx>
 #include <comphelper/fileformat.h>
-#include <comphelper/interfacecontainer4.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/unoimplbase.hxx>
 #include <cppu/cppudllapi.h>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
@@ -209,8 +204,9 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/weakref.hxx>
+#include <editeng/EPosition.hxx>
+#include <editeng/ESelection.hxx>
+#include <editeng/editengdllapi.h>
 #include <font/FontSelectPattern.hxx>
 #include <font/PhysicalFontCollection.hxx>
 #include <font/PhysicalFontFace.hxx>
@@ -220,6 +216,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/i18nutildllapi.h>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/deleter.hxx>
 #include <o3tl/hash_combine.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
@@ -235,12 +232,14 @@
 #include <salhelper/thread.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
+#include <svl/SfxBroadcaster.hxx>
 #include <svl/hint.hxx>
 #include <svl/macitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
 #include <test/outputdevice.hxx>
+#include <tools/UnitConversion.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
@@ -278,7 +277,6 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
-#include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/unotoolsdllapi.h>
 #endif // PCH_LEVEL >= 3
@@ -287,12 +285,11 @@
 #include <accel.hxx>
 #include <brdwin.hxx>
 #include <configsettings.hxx>
+#include <dndlistenercontainer.hxx>
 #include <drawmode.hxx>
 #include <fontattributes.hxx>
-#include <glyphid.hxx>
 #include <impfontcache.hxx>
 #include <impglyphitem.hxx>
-#include <ppdparser.hxx>
 #include <salbmp.hxx>
 #include <salframe.hxx>
 #include <salgdi.hxx>
@@ -312,13 +309,14 @@
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
 #include <vcl/BinaryDataContainer.hxx>
 #include <vcl/BitmapColor.hxx>
-#include <vcl/BitmapFilter.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/BitmapTools.hxx>
+#include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/QueueInfo.hxx>
 #include <vcl/TypeSerializer.hxx>
 #include <vcl/bitmap.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/canvastools.hxx>
@@ -342,7 +340,6 @@
 #include <vcl/formatter.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
-#include <vcl/glyphitem.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -363,6 +360,7 @@
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/skia/SkiaHelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/tabctrl.hxx>
@@ -393,7 +391,6 @@
 #include <vcl/unohelp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclevent.hxx>
-#include <vcl/vcllayout.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx 
b/vcl/qa/cppunit/BitmapFilterTest.cxx
index c34b121e4959..9a7c00a1d0fa 100644
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -9,21 +9,20 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/BitmapWriteAccess.hxx>
-
 #include <tools/stream.hxx>
+
+#include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
+#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx>
+#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapLightenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx>
+#include <vcl/bitmap/BitmapNormalBlendFilter.hxx>
+#include <vcl/bitmap/BitmapScreenBlendFilter.hxx>
+#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx>
+#include <vcl/bitmap/BitmapFilterStackBlur.hxx>
 #include <vcl/graphicfilter.hxx>
 
-#include <vcl/BitmapAlphaClampFilter.hxx>
-#include <vcl/BitmapArithmeticBlendFilter.hxx>
-#include <vcl/BitmapDarkenBlendFilter.hxx>
-#include <vcl/BitmapLightenBlendFilter.hxx>
-#include <vcl/BitmapMultiplyBlendFilter.hxx>
-#include <vcl/BitmapNormalBlendFilter.hxx>
-#include <vcl/BitmapScreenBlendFilter.hxx>
-#include <vcl/BitmapBasicMorphologyFilter.hxx>
-#include <vcl/BitmapFilterStackBlur.hxx>
 #include <BitmapSymmetryCheck.hxx>
 
 #include <chrono>
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index e00f2e0dc873..2a1249f40b10 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -16,12 +16,11 @@
 #include <rtl/strbuf.hxx>
 
 #include <vcl/BitmapTools.hxx>
-#include <vcl/bitmap.hxx>
+#include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
 
-#include <vcl/BitmapWriteAccess.hxx>
 #include <bitmap/Octree.hxx>
 #include <salinst.hxx>
 #include <svdata.hxx>
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx 
b/vcl/qa/cppunit/png/PngFilterTest.cxx
index b9160d1602f7..8d979d393c91 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -25,8 +25,7 @@
 #include <tools/stream.hxx>
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
-#include <vcl/BitmapReadAccess.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 0233288e77fd..f0256f345021 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -26,9 +26,9 @@
 #include <sal/log.hxx>
 
 #include <vcl/animate/Animation.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/bitmap/BitmapColorQuantizationFilter.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/BitmapColorQuantizationFilter.hxx>
+#include <vcl/outdev.hxx>
 
 #include <animate/AnimationRenderer.hxx>
 
diff --git a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx 
b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
index d36261b2eb4d..a12ee67cc145 100644
--- a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
+++ b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
@@ -8,8 +8,7 @@
  *
  */
 
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapAlphaClampFilter.hxx>
+#include <vcl/bitmap/BitmapAlphaClampFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapAlphaClampFilter::execute(BitmapEx const& rBitmapEx) const
diff --git a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx 
b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
index 8f88fac58e60..60c274abd8ae 100644
--- a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapArithmeticBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx 
b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
index e4285cb53a9f..11b0b456e35c 100644
--- a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
+++ b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx
@@ -10,9 +10,10 @@
 
 #include <sal/config.h>
 
-#include <comphelper/threadpool.hxx>
 #include <sal/log.hxx>
-#include <vcl/BitmapBasicMorphologyFilter.hxx>
+#include <comphelper/threadpool.hxx>
+
+#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx 
b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
index df57b5d44246..e8bb7817b95c 100644
--- a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
@@ -10,9 +10,7 @@
 
 #include <sal/config.h>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapColorQuantizationFilter.hxx>
+#include <vcl/bitmap/BitmapColorQuantizationFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx 
b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
index 4caed2b7b3be..2d5355439db4 100644
--- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
+++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
@@ -10,10 +10,8 @@
 
 #include <tools/helpers.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapConvolutionMatrixFilter.hxx>
-#include <vcl/BitmapSharpenFilter.hxx>
+#include <vcl/bitmap/BitmapConvolutionMatrixFilter.hxx>
+#include <vcl/bitmap/BitmapSharpenFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <array>
diff --git a/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx 
b/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx
index 708829dc7c76..2924a78c7e11 100644
--- a/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapDarkenBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapDuoToneFilter.cxx 
b/vcl/source/bitmap/BitmapDuoToneFilter.cxx
index c9cc10b1d1a4..99e25efa145a 100644
--- a/vcl/source/bitmap/BitmapDuoToneFilter.cxx
+++ b/vcl/source/bitmap/BitmapDuoToneFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapDuoToneFilter.hxx>
+#include <vcl/bitmap/BitmapDuoToneFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 static sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16 
color1, sal_uInt16 color2)
diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx 
b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
index 325badb4d16a..cb5c81438c9f 100644
--- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx
@@ -12,9 +12,7 @@
 
 #include <tools/helpers.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapEmbossGreyFilter.hxx>
+#include <vcl/bitmap/BitmapEmbossGreyFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 457ed4942994..b44a1ca5cad9 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -26,13 +26,13 @@
 #include <basegfx/color/bcolormodifier.hxx>
 
 #include <vcl/ImageTree.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
 
 // BitmapEx::Create
 #include <salbmp.hxx>
diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx 
b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
index 787ed27054da..09a44cafb59c 100644
--- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx
+++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx
@@ -8,12 +8,12 @@
  *
  */
 
-#include <vcl/BitmapFilterStackBlur.hxx>
-#include <vcl/BitmapWriteAccess.hxx>
 #include <sal/log.hxx>
-
 #include <comphelper/threadpool.hxx>
 
+#include <vcl/bitmap/BitmapFilterStackBlur.hxx>
+#include <vcl/BitmapWriteAccess.hxx>
+
 namespace
 {
 const sal_Int16 constMultiplyTable[255]
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx 
b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index d1bc188c95a7..8489162ab8ca 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -10,9 +10,7 @@
 
 #include <tools/helpers.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapGaussianSeparableBlurFilter.hxx>
+#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx) 
const
diff --git a/vcl/source/bitmap/BitmapLightenBlendFilter.cxx 
b/vcl/source/bitmap/BitmapLightenBlendFilter.cxx
index b683034c1f4c..8d06ae1228d9 100644
--- a/vcl/source/bitmap/BitmapLightenBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapLightenBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapLightenBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapLightenBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx 
b/vcl/source/bitmap/BitmapMedianFilter.cxx
index ccae104b4c20..bee7e47cda90 100644
--- a/vcl/source/bitmap/BitmapMedianFilter.cxx
+++ b/vcl/source/bitmap/BitmapMedianFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapMedianFilter.hxx>
+#include <vcl/bitmap/BitmapMedianFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #define S2(a, b)                                                               
                    \
diff --git a/vcl/source/bitmap/BitmapMonochromeFilter.cxx 
b/vcl/source/bitmap/BitmapMonochromeFilter.cxx
index 012abb287c26..c8205c2d2384 100644
--- a/vcl/source/bitmap/BitmapMonochromeFilter.cxx
+++ b/vcl/source/bitmap/BitmapMonochromeFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapMonochromeFilter::execute(BitmapEx const& aBitmapEx) const
diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx 
b/vcl/source/bitmap/BitmapMosaicFilter.cxx
index 070b4932cf09..273c4040cc15 100644
--- a/vcl/source/bitmap/BitmapMosaicFilter.cxx
+++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapMosaicFilter.hxx>
+#include <vcl/bitmap/BitmapMosaicFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx) const
diff --git a/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx 
b/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx
index 168e6c3ecdfc..d944c5173655 100644
--- a/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapMultiplyBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapNormalBlendFilter.cxx 
b/vcl/source/bitmap/BitmapNormalBlendFilter.cxx
index 922680fea2b1..88a4f3180c63 100644
--- a/vcl/source/bitmap/BitmapNormalBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapNormalBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapNormalBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapNormalBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx 
b/vcl/source/bitmap/BitmapPopArtFilter.cxx
index bbb42843d397..375539f3168d 100644
--- a/vcl/source/bitmap/BitmapPopArtFilter.cxx
+++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx
@@ -9,9 +9,8 @@
  */
 
 #include <tools/solar.h>
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapPopArtFilter.hxx>
+
+#include <vcl/bitmap/BitmapPopArtFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx) const
diff --git a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx 
b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
index e954fce7c364..f141aeaafc4c 100644
--- a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
+++ b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx
@@ -9,7 +9,8 @@
  */
 
 #include <comphelper/diagnose_ex.hxx>
-#include <vcl/BitmapScreenBlendFilter.hxx>
+
+#include <vcl/bitmap/BitmapScreenBlendFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <vcl/BitmapTools.hxx>
 
diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx 
b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
index a65cd6ee5606..91a3b5483a7f 100644
--- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
@@ -10,10 +10,8 @@
 
 #include <tools/helpers.hxx>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapGaussianSeparableBlurFilter.hxx>
-#include <vcl/BitmapSeparableUnsharpenFilter.hxx>
+#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx>
+#include <vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx) 
const
diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx 
b/vcl/source/bitmap/BitmapSepiaFilter.cxx
index 991df6935fb5..877647b21f9d 100644
--- a/vcl/source/bitmap/BitmapSepiaFilter.cxx
+++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx
@@ -10,9 +10,7 @@
 
 #include <sal/config.h>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapSepiaFilter.hxx>
+#include <vcl/bitmap/BitmapSepiaFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapShadowFilter.cxx 
b/vcl/source/bitmap/BitmapShadowFilter.cxx
index 76da85b3bf0b..00174fd67ec1 100644
--- a/vcl/source/bitmap/BitmapShadowFilter.cxx
+++ b/vcl/source/bitmap/BitmapShadowFilter.cxx
@@ -8,9 +8,8 @@
  *
  */
 
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap/BitmapShadowFilter.hxx>
 #include <vcl/BitmapColor.hxx>
-#include <vcl/BitmapShadowFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapShadowFilter::execute(BitmapEx const& rBitmapEx) const
diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx 
b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
index 5819f4afb206..d885d66beab3 100644
--- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
+#include <vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 #include <bitmap/Octree.hxx>
 
diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx 
b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
index e9c135f8ec59..3fa43e67fb11 100644
--- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
@@ -8,10 +8,9 @@
  *
  */
 
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapGaussianSeparableBlurFilter.hxx>
-#include <vcl/BitmapSeparableUnsharpenFilter.hxx>
-#include <vcl/BitmapSmoothenFilter.hxx>
+#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx>
+#include <vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx>
+#include <vcl/bitmap/BitmapSmoothenFilter.hxx>
 
 BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const
 {
diff --git a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx 
b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
index 92a5ba2f9bdb..6c798a595422 100644
--- a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
+++ b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx
@@ -10,9 +10,7 @@
 
 #include <sal/config.h>
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapSobelGreyFilter.hxx>
+#include <vcl/bitmap/BitmapSobelGreyFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <algorithm>
diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx 
b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
index ca2485a7f4e0..2e35fb94d2ff 100644
--- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
@@ -8,9 +8,7 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/BitmapSolarizeFilter.hxx>
+#include <vcl/bitmap/BitmapSolarizeFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 267a34323c2d..33f44d967e81 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -34,7 +34,7 @@
 #if HAVE_FEATURE_SKIA
 #include <vcl/skia/SkiaHelper.hxx>
 #endif
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 
 #include <bitmap/BitmapScaleSuperFilter.hxx>
 #include <bitmap/BitmapScaleConvolutionFilter.hxx>
diff --git a/vcl/source/bitmap/bitmapfilter.cxx 
b/vcl/source/bitmap/bitmapfilter.cxx
index 63ccd2b13021..3ca1bcae2977 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -8,11 +8,11 @@
  *
  */
 
-#include <vcl/BitmapFilter.hxx>
-#include <vcl/animate/Animation.hxx>
-
 #include <sal/log.hxx>
 
+#include <vcl/animate/Animation.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
+
 BitmapFilter::BitmapFilter() {}
 
 BitmapFilter::~BitmapFilter() {}
diff --git a/vcl/source/graphic/UnoGraphic.cxx 
b/vcl/source/graphic/UnoGraphic.cxx
index 484d04443f72..b91d6ad9de09 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -26,7 +26,7 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapColor.hxx>
-#include <vcl/BitmapDuoToneFilter.hxx>
+#include <vcl/bitmap/BitmapDuoToneFilter.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index 89b8cc2b5989..fa469bc20e69 100644
--- a/vcl/source/image/ImplImage.cxx
+++ b/vcl/source/image/ImplImage.cxx
@@ -18,21 +18,23 @@
  */
 
 #include <sal/log.hxx>
-#include <utility>
+#include <comphelper/lok.hxx>
+
 #include <vcl/svapp.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap/BitmapFilter.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/BitmapFilter.hxx>
 #include <vcl/ImageTree.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
+
 #include <bitmap/BitmapDisabledImageFilter.hxx>
-#include <comphelper/lok.hxx>
 
 #include <image.h>
 #include <salgdi.hxx>
 
+#include <utility>
+
 ImplImage::ImplImage(const BitmapEx &rBitmapEx)
     : maBitmapChecksum(0)
     , maSizePixel(rBitmapEx.GetSizePixel())
diff --git a/vcl/source/rendercontext/drawmode.cxx 
b/vcl/source/rendercontext/drawmode.cxx
index fd3f29ac275f..d4c59f97618c 100644
--- a/vcl/source/rendercontext/drawmode.cxx
+++ b/vcl/source/rendercontext/drawmode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/BitmapMonochromeFilter.hxx>
+#include <vcl/bitmap/BitmapMonochromeFilter.hxx>
 #include <vcl/bitmap/BitmapTypes.hxx>
 #include <vcl/rendercontext/DrawModeFlags.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index d66cff30ae07..256967668004 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -23,7 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/BitmapSimpleColorQuantizationFilter.hxx>
+#include <vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx>
 
 #include <sal/log.hxx>
 #include <unx/x11/xlimits.hxx>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 215fd92a2d7c..0f89a68c1156 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -51,7 +51,7 @@
 #include <vcl/kernarray.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/ImageTree.hxx>
-#include <vcl/BitmapEmbossGreyFilter.hxx>
+#include <vcl/bitmap/BitmapEmbossGreyFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
 #include <basegfx/numeric/ftools.hxx>

Reply via email to