[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer solenv/clang-format

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 21 09:30:43 UTC 2020 

 drawinglayer/inc/pch/precompiled_drawinglayer.hxx             |   12 --
 drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx      |    7 -
 drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx    |    5 -
 drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx       |    5 -
 drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx      |   23 ++---
 drawinglayer/inc/primitive3d/shadowprimitive3d.hxx            |    5 -
 drawinglayer/inc/primitive3d/textureprimitive3d.hxx           |    5 -
 drawinglayer/inc/processor3d/defaultprocessor3d.hxx           |    5 -
 drawinglayer/inc/processor3d/geometry2dextractor.hxx          |    4 
 drawinglayer/inc/processor3d/shadow3dextractor.hxx            |    5 -
 drawinglayer/inc/processor3d/zbufferprocessor3d.hxx           |    7 -
 drawinglayer/inc/texture/texture.hxx                          |    5 -
 drawinglayer/inc/texture/texture3d.hxx                        |    7 -
 drawinglayer/source/primitive2d/cropprimitive2d.cxx           |    2 
 drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx     |    2 
 drawinglayer/source/primitive2d/epsprimitive2d.cxx            |    2 
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx   |    2 
 drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx    |    4 
 drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx      |    4 
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx        |    4 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx  |    2 
 drawinglayer/source/primitive2d/gridprimitive2d.cxx           |    2 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx    |    2 
 drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx     |    2 
 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx    |    2 
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx          |    6 -
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx  |    6 -
 drawinglayer/source/primitive2d/texteffectprimitive2d.cxx     |    2 
 drawinglayer/source/primitive2d/textlineprimitive2d.cxx       |    2 
 drawinglayer/source/primitive2d/textprimitive2d.cxx           |    2 
 drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx  |    2 
 drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx      |    2 
 drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx   |    4 
 drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx |    2 
 drawinglayer/source/primitive3d/polygonprimitive3d.cxx        |    2 
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx    |    2 
 drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx        |    2 
 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx   |   10 +-
 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx     |    2 
 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx       |    2 
 drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx |    2 
 drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx      |    2 
 drawinglayer/source/primitive3d/shadowprimitive3d.cxx         |    2 
 drawinglayer/source/primitive3d/textureprimitive3d.cxx        |    2 
 drawinglayer/source/processor2d/hittestprocessor2d.cxx        |    2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx    |    4 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx       |    6 -
 drawinglayer/source/processor2d/vclprocessor2d.cxx            |    4 
 drawinglayer/source/processor3d/cutfindprocessor3d.cxx        |    4 
 drawinglayer/source/processor3d/defaultprocessor3d.cxx        |   10 +-
 drawinglayer/source/processor3d/geometry2dextractor.cxx       |    4 
 drawinglayer/source/processor3d/shadow3dextractor.cxx         |    4 
 drawinglayer/source/processor3d/zbufferprocessor3d.cxx        |    4 
 drawinglayer/source/texture/texture.cxx                       |    2 
 drawinglayer/source/texture/texture3d.cxx                     |    4 
 drawinglayer/source/tools/wmfemfhelper.cxx                    |   12 +-
 solenv/clang-format/blacklist                                 |   44 +++++-----
 57 files changed, 121 insertions(+), 164 deletions(-)

New commits:
commit ad38105f45b517e09bf65a76e66517ece41fb62e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Mar 20 12:09:42 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Mar 21 10:30:07 2020 +0100

    move headers inside modules
    
    Change-Id: Iad5c414861eb807e6246b8a988b94d66ef5f687d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90776
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index c07ffd345150..b5fb42d97e6e 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.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 2020-01-22 15:57:44 using:
+ Generated on 2020-03-20 13:37:39 using:
  ./bin/update_pch drawinglayer drawinglayer --cutoff=4 --exclude:system --exclude:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -57,6 +57,7 @@
 #include <sal/detail/log.h>
 #include <sal/log.hxx>
 #include <sal/types.h>
+#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dllapi.h>
@@ -143,10 +144,8 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
-#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
@@ -155,10 +154,8 @@
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
@@ -168,18 +165,13 @@
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive3d/baseprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/sdrextrudelathetools3d.hxx>
 #include <drawinglayer/primitive3d/sdrprimitive3d.hxx>
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <drawinglayer/processor3d/baseprocessor3d.hxx>
-#include <drawinglayer/texture/texture.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/cropprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/cropprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/primitive2d/epsprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/epsprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/epsprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
rename to drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/textlineprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx
similarity index 100%
rename from include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
rename to drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx
diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
similarity index 91%
rename from include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
rename to drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
index cb71a402fce5..1329bf70647f 100644
--- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
+#include <primitive3d/textureprimitive3d.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 
 
@@ -76,6 +75,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx
similarity index 92%
rename from include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
rename to drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx
index 4a474e9db7fc..246abe38a664 100644
--- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -59,6 +58,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx
similarity index 95%
rename from include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
rename to drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx
index 2f7e85ac8094..e27201ad6a12 100644
--- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -90,6 +89,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
similarity index 71%
rename from include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
rename to drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
index ac158615a19e..c2057db81f11 100644
--- a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
+++ b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -49,25 +48,25 @@ namespace drawinglayer
     namespace primitive3d
     {
         // #i98295#
-        basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
-        void DRAWINGLAYER_DLLPUBLIC applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange);
-        void DRAWINGLAYER_DLLPUBLIC applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
-        void DRAWINGLAYER_DLLPUBLIC applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
+        basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
+        void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange);
+        void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
+        void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill);
 
         // #i98314#
-        void DRAWINGLAYER_DLLPUBLIC applyTextureTo3DGeometry(
+        void applyTextureTo3DGeometry(
             css::drawing::TextureProjectionMode eModeX,
             css::drawing::TextureProjectionMode eModeY,
             ::std::vector< basegfx::B3DPolyPolygon >& rFill,
             const basegfx::B3DRange& rRange,
             const basegfx::B2DVector& rTextureSize);
 
-        Primitive3DContainer DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonLinePrimitives(
+        Primitive3DContainer create3DPolyPolygonLinePrimitives(
             const basegfx::B3DPolyPolygon& rUnitPolyPolygon,
             const basegfx::B3DHomMatrix& rObjectTransform,
             const attribute::SdrLineAttribute& rLine);
 
-        Primitive3DContainer DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonFillPrimitives(
+        Primitive3DContainer create3DPolyPolygonFillPrimitives(
             const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
             const basegfx::B3DHomMatrix& rObjectTransform,
             const basegfx::B2DVector& rTextureSize,
@@ -75,12 +74,12 @@ namespace drawinglayer
             const attribute::SdrFillAttribute& rFill,
             const attribute::FillGradientAttribute& rFillGradient);
 
-        Primitive3DContainer DRAWINGLAYER_DLLPUBLIC createShadowPrimitive3D(
+        Primitive3DContainer createShadowPrimitive3D(
             const Primitive3DContainer& rSource,
             const attribute::SdrShadowAttribute& rShadow,
             bool bShadow3D);
 
-        Primitive3DContainer DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives3D(
+        Primitive3DContainer createHiddenGeometryPrimitives3D(
             const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector,
             const basegfx::B3DHomMatrix& rObjectTransform,
             const basegfx::B2DVector& rTextureSize,
@@ -90,6 +89,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
similarity index 93%
rename from include/drawinglayer/primitive3d/shadowprimitive3d.hxx
rename to drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
index e47804a00346..60ec61fe7dff 100644
--- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -75,6 +74,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx
similarity index 97%
rename from include/drawinglayer/primitive3d/textureprimitive3d.hxx
rename to drawinglayer/inc/primitive3d/textureprimitive3d.hxx
index 248c6b09350b..0dc3ed4d3b19 100644
--- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -217,6 +216,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
similarity index 97%
rename from include/drawinglayer/processor3d/defaultprocessor3d.hxx
rename to drawinglayer/inc/processor3d/defaultprocessor3d.hxx
index 6e4548b94710..2a8b179a1ba7 100644
--- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX
-#define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX
+#pragma once
 
 #include <drawinglayer/processor3d/baseprocessor3d.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -144,6 +143,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif // INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
similarity index 93%
rename from include/drawinglayer/processor3d/geometry2dextractor.hxx
rename to drawinglayer/inc/processor3d/geometry2dextractor.hxx
index e9b13e1ccfc6..ae3050fb2850 100644
--- a/include/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX
-#define INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -67,6 +66,5 @@ namespace drawinglayer
     } // end of namespace processor3d
 } // end of namespace drawinglayer
 
-#endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
similarity index 96%
rename from include/drawinglayer/processor3d/shadow3dextractor.hxx
rename to drawinglayer/inc/processor3d/shadow3dextractor.hxx
index ed8cf966347c..37c1c0f0e6fc 100644
--- a/include/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX
-#define INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -97,6 +96,4 @@ namespace drawinglayer
     } // end of namespace processor3d
 } // end of namespace drawinglayer
 
-#endif //_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
similarity index 94%
rename from include/drawinglayer/processor3d/zbufferprocessor3d.hxx
rename to drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
index 94b4ae4cb837..9a0b422ac380 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
@@ -17,10 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX
-#define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX
+#pragma once
 
-#include <drawinglayer/processor3d/defaultprocessor3d.hxx>
+#include <processor3d/defaultprocessor3d.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <memory>
 
@@ -94,6 +93,4 @@ namespace drawinglayer
     }
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/texture/texture.hxx b/drawinglayer/inc/texture/texture.hxx
similarity index 98%
rename from include/drawinglayer/texture/texture.hxx
rename to drawinglayer/inc/texture/texture.hxx
index a8656f962454..c61d8d2b1674 100644
--- a/include/drawinglayer/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX
-#define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
@@ -337,6 +336,4 @@ namespace drawinglayer
 } // end of namespace drawinglayer
 
 
-#endif //_DRAWINGLAYER_TEXTURE_TEXTURE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx
similarity index 96%
rename from include/drawinglayer/texture/texture3d.hxx
rename to drawinglayer/inc/texture/texture3d.hxx
index 43e0c1cd67de..b5ac6e514f04 100644
--- a/include/drawinglayer/texture/texture3d.hxx
+++ b/drawinglayer/inc/texture/texture3d.hxx
@@ -17,12 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX
-#define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX
+#pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <vcl/bitmapex.hxx>
 
 namespace drawinglayer { namespace primitive3d {
@@ -141,6 +140,4 @@ namespace drawinglayer
     } // end of namespace texture
 } // end of namespace drawinglayer
 
-#endif // INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index 019803db11ac..5dbc13ff4119 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/cropprimitive2d.hxx>
+#include <primitive2d/cropprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index 8f05bb2c813c..e38afeb4d612 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -25,7 +25,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
-#include <drawinglayer/processor3d/shadow3dextractor.hxx>
+#include <processor3d/shadow3dextractor.hxx>
 
 
 using namespace com::sun::star;
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index b519547c00d7..8ad1db87ac4d 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <primitive2d/epsprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
 
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 42defa8081b1..bab1b5e7dfdc 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -20,7 +20,7 @@
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index 7a188efcc63c..af2c75a42720 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -20,11 +20,11 @@
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <drawinglayer/primitive2d/graphicprimitivehelper2d.hxx>
+#include <primitive2d/graphicprimitivehelper2d.hxx>
 
 
 using namespace com::sun::star;
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 473b0b51a229..ceffef12e4b3 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <primitive2d/fillhatchprimitive2d.hxx>
+#include <texture/texture.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index f3793d4bcf73..ee07fd29f841 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -22,9 +22,9 @@
 #include <algorithm>
 
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
-#include <drawinglayer/primitive2d/cropprimitive2d.hxx>
+#include <primitive2d/cropprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <drawinglayer/primitive2d/graphicprimitivehelper2d.hxx>
+#include <primitive2d/graphicprimitivehelper2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 45ba38c2ece5..7c8597a14498 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include <drawinglayer/primitive2d/graphicprimitivehelper2d.hxx>
+#include <primitive2d/graphicprimitivehelper2d.hxx>
 #include <drawinglayer/animation/animationtiming.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/animatedprimitive2d.hxx>
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 2e9b62fa0db4..232c35fa66c2 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <drawinglayer/primitive2d/gridprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 5e9914f102b0..e754a7f97e59 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -23,7 +23,7 @@
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index 7e527487eb85..66ca43bd8004 100644
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 
 
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 71b36df77937..1a521ab65243 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -21,7 +21,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
-#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
+#include <primitive2d/fillhatchprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index aa8271b25675..66264ae9a039 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -23,12 +23,12 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <drawinglayer/attribute/sdrlightattribute3d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/processor3d/zbufferprocessor3d.hxx>
-#include <drawinglayer/processor3d/shadow3dextractor.hxx>
+#include <processor3d/zbufferprocessor3d.hxx>
+#include <processor3d/shadow3dextractor.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
-#include <drawinglayer/processor3d/geometry2dextractor.hxx>
+#include <processor3d/geometry2dextractor.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <vcl/BitmapTools.hxx>
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index 4325cbc3e792..2f354f7d67b0 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -20,10 +20,10 @@
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <drawinglayer/primitive2d/texteffectprimitive2d.hxx>
+#include <primitive2d/texteffectprimitive2d.hxx>
 #include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
-#include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
-#include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
+#include <primitive2d/textlineprimitive2d.hxx>
+#include <primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textbreakuphelper.hxx>
 
 
diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
index 6d1948bee899..b552793bf625 100644
--- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/texteffectprimitive2d.hxx>
+#include <primitive2d/texteffectprimitive2d.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index ce734894b02c..0a8905164fcd 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
+#include <primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
 #include <drawinglayer/attribute/lineattribute.hxx>
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 78a07e89f7e2..f4fbab7c2bfa 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -22,7 +22,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <drawinglayer/primitive2d/texteffectprimitive2d.hxx>
+#include <primitive2d/texteffectprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index 579662b4827b..a2707cc3ca96 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
+#include <primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index a4d95e94cbc3..921483861b60 100644
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive2d/wallpaperprimitive2d.hxx>
+#include <primitive2d/wallpaperprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index 196f95785a35..2ea280b68be1 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
+#include <primitive3d/hatchtextureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
index c35a3d1789a4..1a367e501d29 100644
--- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx>
+#include <primitive3d/hiddengeometryprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 
 
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 9616f54c2e22..ac820546b9fa 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -20,7 +20,7 @@
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
-#include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
+#include <primitive3d/polygontubeprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 
 
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 3c7d945a8491..177d829ef4fc 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
+#include <primitive3d/polygontubeprimitive3d.hxx>
 #include <drawinglayer/attribute/materialattribute3d.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 34ab8788efb7..6297c7df0b07 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -21,7 +21,7 @@
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
index 5d2a2b6d2e1d..826583b1404c 100644
--- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
 #include <drawinglayer/primitive3d/baseprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
@@ -26,16 +26,16 @@
 #include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
+#include <primitive3d/textureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
-#include <drawinglayer/primitive3d/shadowprimitive3d.hxx>
+#include <primitive3d/hatchtextureprimitive3d.hxx>
+#include <primitive3d/shadowprimitive3d.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
 #include <drawinglayer/attribute/sdrobjectattribute3d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 #include <drawinglayer/attribute/sdrshadowattribute.hxx>
-#include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx>
+#include <primitive3d/hiddengeometryprimitive3d.hxx>
 
 
 namespace drawinglayer::primitive3d
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 6633fd2dd7f3..b7d1c8abdd9b 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -24,7 +24,7 @@
 #include <drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 0933833b6087..1d5b918a27bf 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -20,7 +20,7 @@
 #include <drawinglayer/primitive3d/sdrlatheprimitive3d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 08c57bf1beae..4887802e17a4 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index bbaa69cbc064..1e0dd7454124 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -20,7 +20,7 @@
 #include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
+#include <primitive3d/sdrdecompositiontools3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index 1816c159cb8a..cca2e3c6f07f 100644
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/shadowprimitive3d.hxx>
+#include <primitive3d/shadowprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 
 
diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
index 2010fde07737..a053a7c214d0 100644
--- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
+#include <primitive3d/textureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index bf6980229cb2..159ef863d0c2 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -27,7 +27,7 @@
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <drawinglayer/primitive2d/sceneprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <drawinglayer/processor3d/cutfindprocessor3d.hxx>
 #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 5fe6bc952a0c..f3d6bf0c281d 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -40,7 +40,7 @@
 #include <tools/stream.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/texthierarchyprimitive2d.hxx>
@@ -54,7 +54,7 @@
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <primitive2d/epsprimitive2d.hxx>
 #include <basegfx/polygon/b2dlinegeometry.hxx>
 
 // for PDFExtOutDevData Graphic support
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 238cf4c354ad..2bbfe6b1ec50 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -33,7 +33,7 @@
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
 #include <drawinglayer/primitive2d/controlprimitive2d.hxx>
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
@@ -41,13 +41,13 @@
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include "helperwrongspellrenderer.hxx"
-#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
+#include <primitive2d/fillhatchprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <vcl/hatch.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/awt/XControl.hpp>
 #include <drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx>
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <primitive2d/epsprimitive2d.hxx>
 #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
 
 #include <vcl/dibtools.hxx>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 19ce174ec8b5..72c8a038ebaa 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -37,12 +37,12 @@
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx>
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <primitive2d/epsprimitive2d.hxx>
 #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
index 67435afc8811..432ef87d3a85 100644
--- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
@@ -20,12 +20,12 @@
 #include <drawinglayer/processor3d/cutfindprocessor3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
+#include <primitive3d/hatchtextureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx>
+#include <primitive3d/hiddengeometryprimitive3d.hxx>
 
 
 namespace drawinglayer::processor3d
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 6415fb00a2ed..dc25be5edd1b 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/processor3d/defaultprocessor3d.hxx>
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
-#include <drawinglayer/texture/texture.hxx>
-#include <drawinglayer/texture/texture3d.hxx>
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
+#include <processor3d/defaultprocessor3d.hxx>
+#include <primitive3d/textureprimitive3d.hxx>
+#include <texture/texture.hxx>
+#include <texture/texture3d.hxx>
+#include <primitive3d/hatchtextureprimitive3d.hxx>
 #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index b1493d699d5b..f91452cdf866 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/processor3d/geometry2dextractor.hxx>
+#include <processor3d/geometry2dextractor.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
 #include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
@@ -27,7 +27,7 @@
 #include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <drawinglayer/primitive3d/textureprimitive3d.hxx>
+#include <primitive3d/textureprimitive3d.hxx>
 
 
 using namespace com::sun::star;
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index a3f05f0af644..99664ce03d35 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/processor3d/shadow3dextractor.hxx>
-#include <drawinglayer/primitive3d/shadowprimitive3d.hxx>
+#include <processor3d/shadow3dextractor.hxx>
+#include <primitive3d/shadowprimitive3d.hxx>
 #include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 6fb14245500f..3c5945af41b7 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <drawinglayer/processor3d/zbufferprocessor3d.hxx>
+#include <processor3d/zbufferprocessor3d.hxx>
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <basegfx/raster/rasterconvert3d.hxx>
 #include <drawinglayer/attribute/materialattribute3d.hxx>
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx
index 7ca4a4f1b164..e3cbc14e4fac 100644
--- a/drawinglayer/source/texture/texture.cxx
+++ b/drawinglayer/source/texture/texture.cxx
@@ -21,7 +21,7 @@
 
 #include <algorithm>
 
-#include <drawinglayer/texture/texture.hxx>
+#include <texture/texture.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/gradienttools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index dd824deb18dd..1ea09cb0fdd9 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include <drawinglayer/texture/texture3d.hxx>
+#include <texture/texture3d.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
-#include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx>
+#include <primitive3d/hatchtextureprimitive3d.hxx>
 #include <sal/log.hxx>
 
 namespace drawinglayer::texture
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 09217d32212e..b42124eddd38 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <wmfemfhelper.hxx>
-#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
+#include <primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
@@ -32,17 +32,17 @@
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
-#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
+#include <primitive2d/fillhatchprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <drawinglayer/primitive2d/invertprimitive2d.hxx>
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
-#include <drawinglayer/primitive2d/wallpaperprimitive2d.hxx>
+#include <primitive2d/wallpaperprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
-#include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
-#include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
-#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
+#include <primitive2d/textlineprimitive2d.hxx>
+#include <primitive2d/textstrikeoutprimitive2d.hxx>
+#include <primitive2d/epsprimitive2d.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index baa2243c2d81..d9fd00828deb 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -3624,6 +3624,28 @@ desktop/win32/source/unoinfo.cxx
 drawinglayer/inc/converters.hxx
 drawinglayer/inc/emfplushelper.hxx
 drawinglayer/inc/wmfemfhelper.hxx
+drawinglayer/inc/primitive2d/cropprimitive2d.hxx
+drawinglayer/inc/primitive2d/epsprimitive2d.hxx
+drawinglayer/inc/primitive2d/fillhatchprimitive2d.hxx
+drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
+drawinglayer/inc/primitive2d/pointarrayprimitive2d.hxx
+drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
+drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
+drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
+drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx
+drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
+drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx
+drawinglayer/inc/primitive3d/polygonprimitive3d.hxx
+drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx
+drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
+drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
+drawinglayer/inc/primitive3d/textureprimitive3d.hxx
+drawinglayer/inc/processor3d/defaultprocessor3d.hxx
+drawinglayer/inc/processor3d/geometry2dextractor.hxx
+drawinglayer/inc/processor3d/shadow3dextractor.hxx
+drawinglayer/inc/processor3d/zbufferprocessor3d.hxx
+drawinglayer/inc/texture/texture.hxx
+drawinglayer/inc/texture/texture3d.hxx
 drawinglayer/qa/unit/border.cxx
 drawinglayer/source/animation/animationtiming.cxx
 drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -5847,16 +5869,12 @@ include/drawinglayer/attribute/sdrsceneattribute3d.hxx
 include/drawinglayer/attribute/sdrshadowattribute.hxx
 include/drawinglayer/attribute/strokeattribute.hxx
 include/drawinglayer/geometry/viewinformation3d.hxx
-include/drawinglayer/primitive2d/cropprimitive2d.hxx
 include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
 include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
 include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
 include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
-include/drawinglayer/primitive2d/epsprimitive2d.hxx
 include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
 include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
-include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
-include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx
 include/drawinglayer/primitive2d/gridprimitive2d.hxx
 include/drawinglayer/primitive2d/groupprimitive2d.hxx
 include/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -5871,7 +5889,6 @@ include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
 include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
 include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
 include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
-include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
 include/drawinglayer/primitive2d/polygonprimitive2d.hxx
 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
 include/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -5882,37 +5899,26 @@ include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
 include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
 include/drawinglayer/primitive2d/textbreakuphelper.hxx
 include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
-include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
 include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
 include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
 include/drawinglayer/primitive2d/textlayoutdevice.hxx
-include/drawinglayer/primitive2d/textlineprimitive2d.hxx
 include/drawinglayer/primitive2d/textprimitive2d.hxx
-include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
 include/drawinglayer/primitive2d/transformprimitive2d.hxx
 include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
 include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
-include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
 include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
 include/drawinglayer/primitive3d/baseprimitive3d.hxx
 include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
 include/drawinglayer/primitive3d/groupprimitive3d.hxx
-include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
-include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
 include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
-include/drawinglayer/primitive3d/polygonprimitive3d.hxx
-include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
 include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
 include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
-include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
 include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
 include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
 include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
 include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
 include/drawinglayer/primitive3d/sdrprimitive3d.hxx
 include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
-include/drawinglayer/primitive3d/shadowprimitive3d.hxx
-include/drawinglayer/primitive3d/textureprimitive3d.hxx
 include/drawinglayer/primitive3d/transformprimitive3d.hxx
 include/drawinglayer/processor2d/baseprocessor2d.hxx
 include/drawinglayer/processor2d/contourextractor2d.hxx
@@ -5924,12 +5930,6 @@ include/drawinglayer/processor2d/processorfromoutputdevice.hxx
 include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
 include/drawinglayer/processor3d/baseprocessor3d.hxx
 include/drawinglayer/processor3d/cutfindprocessor3d.hxx
-include/drawinglayer/processor3d/defaultprocessor3d.hxx
-include/drawinglayer/processor3d/geometry2dextractor.hxx
-include/drawinglayer/processor3d/shadow3dextractor.hxx
-include/drawinglayer/processor3d/zbufferprocessor3d.hxx
-include/drawinglayer/texture/texture.hxx
-include/drawinglayer/texture/texture3d.hxx
 include/drawinglayer/tools/primitive2dxmldump.hxx
 include/editeng/AccessibleComponentBase.hxx
 include/editeng/AccessibleContextBase.hxx

More information about the Libreoffice-commits mailing list