Get rid of unnecessary directory levels $D/inc/$D

Change-Id: Ibf313b8948a493043006ebf3a8281487c1f67b48
Reviewed-on: https://gerrit.libreoffice.org/25532
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

66 files changed, 247 insertions, 247 deletions

diff --git a/svgio/inc/pch/precompiled_svgio.hxx b/svgio/inc/pch/precompiled_svgio.hxx
index 6f8ee9eb9f07..1fbc10a68688 100644
--- a/svgio/inc/pch/precompiled_svgio.hxx
+++ b/svgio/inc/pch/precompiled_svgio.hxx
@@ -56,11 +56,11 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <o3tl/cow_wrapper.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgpaint.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgtoken.hxx>
-#include <svgio/svgreader/svgtools.hxx>
+#include <svgdocument.hxx>
+#include <svgnode.hxx>
+#include <svgpaint.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgtoken.hxx>
+#include <svgtools.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svganode.hxx b/svgio/inc/svganode.hxx
index d58224a120da..ac07032f7adf 100644
--- a/svgio/inc/svgio/svgreader/svganode.hxx
+++ b/svgio/inc/svganode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGANODE_HXX
+#define INCLUDED_SVGIO_INC_SVGANODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -53,6 +53,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGANODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGANODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgcharacternode.hxx
index c1cbd8192594..1025617e5c27 100644
--- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx
+++ b/svgio/inc/svgcharacternode.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
+#include <svgnode.hxx>
 
 namespace drawinglayer { namespace primitive2d { class TextSimplePortionPrimitive2D; }}
 
@@ -164,6 +164,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx
index 9acbe907cf38..99f661dc53d4 100644
--- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx
+++ b/svgio/inc/svgcirclenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -68,6 +68,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCIRCLENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGCIRCLENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgclippathnode.hxx
index 706d4bd84df2..9bd7504f8183 100644
--- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx
+++ b/svgio/inc/svgclippathnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -63,6 +63,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGCLIPPATHNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgdocument.hxx
index 5a4b63119d7b..687fc494c2c3 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgdocument.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX
+#define INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
+#include <svgnode.hxx>
 #include <unordered_map>
 
 namespace svgio
@@ -78,6 +78,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENT_HXX
+#endif // INCLUDED_SVGIO_INC_SVGDOCUMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx
index bc1d10a27821..5069fdbd2eda 100644
--- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
+++ b/svgio/inc/svgdocumenthandler.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX
+#define INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgdocument.hxx>
 #include <cppuhelper/implbase.hxx>
 
 namespace svgio { namespace svgreader { class SvgCharacterNode; }}
@@ -63,6 +63,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX
+#endif // INCLUDED_SVGIO_INC_SVGDOCUMENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx
index 040235c75af8..4e51cff871ec 100644
--- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx
+++ b/svgio/inc/svgellipsenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -73,6 +73,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGELLIPSENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGELLIPSENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svggnode.hxx
index 8d9ad9dec53f..9eb4e022d3d9 100644
--- a/svgio/inc/svgio/svgreader/svggnode.hxx
+++ b/svgio/inc/svggnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGGNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -54,6 +54,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGGNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svggradientnode.hxx
index 43a9752c418b..5e2bea70317b 100644
--- a/svgio/inc/svgio/svgreader/svggradientnode.hxx
+++ b/svgio/inc/svggradientnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
 
 namespace svgio
@@ -125,6 +125,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGGRADIENTNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svggradientstopnode.hxx
index 055b47b0e5cd..d25898e96c06 100644
--- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
+++ b/svgio/inc/svggradientstopnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -52,6 +52,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGGRADIENTSTOPNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx
index c21a9f5eaf3e..f723d147ecf3 100644
--- a/svgio/inc/svgio/svgreader/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -84,6 +84,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGIMAGENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGIMAGENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svglinenode.hxx
index 23e20bd3088e..336c2cd4ca80 100644
--- a/svgio/inc/svgio/svgreader/svglinenode.hxx
+++ b/svgio/inc/svglinenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGLINENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGLINENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -73,6 +73,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGLINENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGLINENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgmarkernode.hxx
index f0cca96096ce..aa61806f1a10 100644
--- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx
+++ b/svgio/inc/svgmarkernode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -111,6 +111,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMARKERNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGMARKERNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgmasknode.hxx
index 84c4bb1de38a..8e04fffc38f4 100644
--- a/svgio/inc/svgio/svgreader/svgmasknode.hxx
+++ b/svgio/inc/svgmasknode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGMASKNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGMASKNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -88,6 +88,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGMASKNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGMASKNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgnode.hxx
index 1b8359dde9b6..9df8419ad6f4 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGNODE_HXX
 
-#include <svgio/svgreader/svgtools.hxx>
-#include <svgio/svgreader/svgtoken.hxx>
-#include <svgio/svgreader/svgpaint.hxx>
+#include <svgtools.hxx>
+#include <svgtoken.hxx>
+#include <svgpaint.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <vector>
@@ -185,6 +185,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgpaint.hxx b/svgio/inc/svgpaint.hxx
index bab262adebdd..367f801260fa 100644
--- a/svgio/inc/svgio/svgreader/svgpaint.hxx
+++ b/svgio/inc/svgpaint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGPAINT_HXX
+#define INCLUDED_SVGIO_INC_SVGPAINT_HXX
 
 #include <basegfx/color/bcolor.hxx>
 
@@ -53,6 +53,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPAINT_HXX
+#endif // INCLUDED_SVGIO_INC_SVGPAINT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgpathnode.hxx
index 0c24244455fb..2cfa01ca21ab 100644
--- a/svgio/inc/svgio/svgreader/svgpathnode.hxx
+++ b/svgio/inc/svgpathnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGPATHNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 namespace svgio
@@ -65,6 +65,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGPATHNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx
index a5b6870ba8fe..cf8165996b8c 100644
--- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx
+++ b/svgio/inc/svgpatternnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -114,6 +114,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPATTERNNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGPATTERNNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgpolynode.hxx
index 0e47c7499c2e..91340be62d46 100644
--- a/svgio/inc/svgio/svgreader/svgpolynode.hxx
+++ b/svgio/inc/svgpolynode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 namespace svgio
@@ -66,6 +66,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGPOLYNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGPOLYNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgrectnode.hxx
index f103876ab49a..a16f36949b73 100644
--- a/svgio/inc/svgio/svgreader/svgrectnode.hxx
+++ b/svgio/inc/svgrectnode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGRECTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGRECTNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -83,6 +83,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGRECTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGRECTNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 141218b3e042..ea9c6c26f4a4 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX
+#define INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX
 
-#include <svgio/svgreader/svgpaint.hxx>
-#include <svgio/svgreader/svgnode.hxx>
+#include <svgpaint.hxx>
+#include <svgnode.hxx>
 #include <vcl/vclenum.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
@@ -473,6 +473,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX
+#endif // INCLUDED_SVGIO_INC_SVGSTYLEATTRIBUTES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgstylenode.hxx
index 8ee7fceec3c2..86809e23f394 100644
--- a/svgio/inc/svgio/svgreader/svgstylenode.hxx
+++ b/svgio/inc/svgstylenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -59,6 +59,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSTYLENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGSTYLENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgsvgnode.hxx
index 15d49505bc4c..a256971b8719 100644
--- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
+++ b/svgio/inc/svgsvgnode.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGSVGNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGSVGNODE_HXX
 
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -99,6 +99,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSVGNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGSVGNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgsymbolnode.hxx
index 6fb3d6e8d7b4..1ec961673ada 100644
--- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
+++ b/svgio/inc/svgsymbolnode.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX
 
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -54,6 +54,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgtextnode.hxx
index 86c13216d1f5..bea1fde1c328 100644
--- a/svgio/inc/svgio/svgreader/svgtextnode.hxx
+++ b/svgio/inc/svgtextnode.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgcharacternode.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgcharacternode.hxx>
 
 namespace svgio
 {
@@ -70,6 +70,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTEXTNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgtextpathnode.hxx
index c0e4242ed27d..33c0e0a87d03 100644
--- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
+++ b/svgio/inc/svgtextpathnode.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgpathnode.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgpathnode.hxx>
 
 namespace svgio
 {
@@ -72,6 +72,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTEXTPATHNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgtitledescnode.hxx
index 26e737c24b1a..c58b694317af 100644
--- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
+++ b/svgio/inc/svgtitledescnode.hxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
+#include <svgnode.hxx>
 
 
 namespace svgio
@@ -49,6 +49,6 @@ namespace svgio
 } // end of namespace svgio
 
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTITLEDESCNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index 112102f8b4cc..714e3807a910 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTOKEN_HXX
+#define INCLUDED_SVGIO_INC_SVGTOKEN_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -191,6 +191,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOKEN_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTOKEN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgtools.hxx
index eccf3ac0df84..c00f0784c481 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTOOLS_HXX
+#define INCLUDED_SVGIO_INC_SVGTOOLS_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <svgio/svgreader/svgpaint.hxx>
+#include <svgpaint.hxx>
 #include <vector>
 
 namespace svgio
@@ -228,6 +228,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTOOLS_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgtrefnode.hxx
index 2440e88bf267..e372887e6496 100644
--- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx
+++ b/svgio/inc/svgtrefnode.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTREFNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGTREFNODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgtextnode.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgtextnode.hxx>
 
 namespace svgio
 {
@@ -53,6 +53,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTREFNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTREFNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgtspannode.hxx
index fd906e04f8b3..1d982b15ef1b 100644
--- a/svgio/inc/svgio/svgreader/svgtspannode.hxx
+++ b/svgio/inc/svgtspannode.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX
+#define INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX
 
-#include <svgio/svgreader/svgcharacternode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgtools.hxx>
+#include <svgcharacternode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgtools.hxx>
 
 namespace svgio
 {
@@ -54,6 +54,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTSPANNODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGTSPANNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgusenode.hxx
index d235747e5ff4..3807f6f121c2 100644
--- a/svgio/inc/svgio/svgreader/svgusenode.hxx
+++ b/svgio/inc/svgusenode.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
-#define INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
+#ifndef INCLUDED_SVGIO_INC_SVGUSENODE_HXX
+#define INCLUDED_SVGIO_INC_SVGUSENODE_HXX
 
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 
 namespace svgio
 {
@@ -75,6 +75,6 @@ namespace svgio
     } // end of namespace svgreader
 } // end of namespace svgio
 
-#endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGUSENODE_HXX
+#endif // INCLUDED_SVGIO_INC_SVGUSENODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svganode.cxx b/svgio/source/svgreader/svganode.cxx
index 70c53d5c0a6f..9efa57331c27 100644
--- a/svgio/source/svgreader/svganode.cxx
+++ b/svgio/source/svgreader/svganode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svganode.hxx>
+#include <svganode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 29fd2561200c..1753f2dd4c6c 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgcharacternode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgcharacternode.hxx>
+#include <svgstyleattributes.hxx>
 #include <drawinglayer/attribute/fontattribute.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 3ac0d0b93cf4..2bbbffb7d7f4 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgcirclenode.hxx>
+#include <svgcirclenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index ada214bc8360..dc607c7e627e 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgclippathnode.hxx>
+#include <svgclippathnode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx
index 28b69a1de8a8..227ad4ae40d6 100644
--- a/svgio/source/svgreader/svgdocument.cxx
+++ b/svgio/source/svgreader/svgdocument.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgdocument.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index e53471d59839..977b54d3b03f 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -17,34 +17,34 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgdocumenthandler.hxx>
-#include <svgio/svgreader/svgtoken.hxx>
-#include <svgio/svgreader/svgsvgnode.hxx>
-#include <svgio/svgreader/svggnode.hxx>
-#include <svgio/svgreader/svganode.hxx>
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgpathnode.hxx>
-#include <svgio/svgreader/svgrectnode.hxx>
-#include <svgio/svgreader/svggradientnode.hxx>
-#include <svgio/svgreader/svggradientstopnode.hxx>
-#include <svgio/svgreader/svgsymbolnode.hxx>
-#include <svgio/svgreader/svgusenode.hxx>
-#include <svgio/svgreader/svgcirclenode.hxx>
-#include <svgio/svgreader/svgellipsenode.hxx>
-#include <svgio/svgreader/svglinenode.hxx>
-#include <svgio/svgreader/svgpolynode.hxx>
-#include <svgio/svgreader/svgtextnode.hxx>
-#include <svgio/svgreader/svgcharacternode.hxx>
-#include <svgio/svgreader/svgtspannode.hxx>
-#include <svgio/svgreader/svgtrefnode.hxx>
-#include <svgio/svgreader/svgtextpathnode.hxx>
-#include <svgio/svgreader/svgstylenode.hxx>
-#include <svgio/svgreader/svgimagenode.hxx>
-#include <svgio/svgreader/svgclippathnode.hxx>
-#include <svgio/svgreader/svgmasknode.hxx>
-#include <svgio/svgreader/svgmarkernode.hxx>
-#include <svgio/svgreader/svgpatternnode.hxx>
-#include <svgio/svgreader/svgtitledescnode.hxx>
+#include <svgdocumenthandler.hxx>
+#include <svgtoken.hxx>
+#include <svgsvgnode.hxx>
+#include <svggnode.hxx>
+#include <svganode.hxx>
+#include <svgnode.hxx>
+#include <svgpathnode.hxx>
+#include <svgrectnode.hxx>
+#include <svggradientnode.hxx>
+#include <svggradientstopnode.hxx>
+#include <svgsymbolnode.hxx>
+#include <svgusenode.hxx>
+#include <svgcirclenode.hxx>
+#include <svgellipsenode.hxx>
+#include <svglinenode.hxx>
+#include <svgpolynode.hxx>
+#include <svgtextnode.hxx>
+#include <svgcharacternode.hxx>
+#include <svgtspannode.hxx>
+#include <svgtrefnode.hxx>
+#include <svgtextpathnode.hxx>
+#include <svgstylenode.hxx>
+#include <svgimagenode.hxx>
+#include <svgclippathnode.hxx>
+#include <svgmasknode.hxx>
+#include <svgmarkernode.hxx>
+#include <svgpatternnode.hxx>
+#include <svgtitledescnode.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 2f0b12df1565..9fab41512a1e 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgellipsenode.hxx>
+#include <svgellipsenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index 2f553786606d..c3ae8ca75c1e 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svggnode.hxx>
+#include <svggnode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 6f2560dcfa50..8137ac3fe50d 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svggradientnode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
-#include <svgio/svgreader/svggradientstopnode.hxx>
+#include <svggradientnode.hxx>
+#include <svgdocument.hxx>
+#include <svggradientstopnode.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx
index 506fd13ae4ff..f2f10d8019aa 100644
--- a/svgio/source/svgreader/svggradientstopnode.cxx
+++ b/svgio/source/svgreader/svggradientstopnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svggradientstopnode.hxx>
+#include <svggradientstopnode.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 53cc5641d962..074f46ff31b7 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgimagenode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgimagenode.hxx>
+#include <svgdocument.hxx>
 #include <sax/tools/converter.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index b63fd8fa9768..2bbcadb14679 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svglinenode.hxx>
+#include <svglinenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx
index c0c2dc76ebcf..5c8ecd21a3e1 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgmarkernode.hxx>
+#include <svgmarkernode.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index bf72eaca25d1..4879e7e7caff 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgmasknode.hxx>
+#include <svgmasknode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index c9bd15adbdf1..a3a77ab15b80 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgdocument.hxx>
+#include <svgnode.hxx>
+#include <svgstyleattributes.hxx>
 #include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/svgio/source/svgreader/svgpaint.cxx b/svgio/source/svgreader/svgpaint.cxx
index e5aa257c14be..fdf44be8d812 100644
--- a/svgio/source/svgreader/svgpaint.cxx
+++ b/svgio/source/svgreader/svgpaint.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgpaint.hxx>
+#include <svgpaint.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index 818a98c32034..9ba246997f86 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgpathnode.hxx>
+#include <svgpathnode.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 namespace svgio
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index c99c4f112a69..6338f96fd1d6 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgpatternnode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgpatternnode.hxx>
+#include <svgdocument.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index fe9efd1c273b..378f4c74cc52 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgpolynode.hxx>
+#include <svgpolynode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index 7b826362fdff..ee10be205fa9 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgrectnode.hxx>
+#include <svgrectnode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index ff4a1853f2f7..db20d64902f8 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -17,24 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgstyleattributes.hxx>
+#include <svgstyleattributes.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
-#include <svgio/svgreader/svgnode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgnode.hxx>
+#include <svgdocument.hxx>
 #include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
-#include <svgio/svgreader/svggradientnode.hxx>
+#include <svggradientnode.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <drawinglayer/processor2d/linegeometryextractor2d.hxx>
 #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-#include <svgio/svgreader/svgclippathnode.hxx>
-#include <svgio/svgreader/svgmasknode.hxx>
+#include <svgclippathnode.hxx>
+#include <svgmasknode.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <svgio/svgreader/svgmarkernode.hxx>
+#include <svgmarkernode.hxx>
 #include <basegfx/curve/b2dcubicbezier.hxx>
-#include <svgio/svgreader/svgpatternnode.hxx>
+#include <svgpatternnode.hxx>
 #include <drawinglayer/primitive2d/patternfillprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index 61497fcde94a..08b3eafd7bcc 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgstylenode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgstylenode.hxx>
+#include <svgdocument.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 324ecf5a4b18..81dfd24b1ca5 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgsvgnode.hxx>
+#include <svgsvgnode.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx
index aec7baef1068..85f1ea5f5cb6 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgsymbolnode.hxx>
+#include <svgsymbolnode.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index ae7d0e104b85..d78912901f86 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtextnode.hxx>
-#include <svgio/svgreader/svgcharacternode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgtrefnode.hxx>
-#include <svgio/svgreader/svgtextpathnode.hxx>
-#include <svgio/svgreader/svgtspannode.hxx>
+#include <svgtextnode.hxx>
+#include <svgcharacternode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgtrefnode.hxx>
+#include <svgtextpathnode.hxx>
+#include <svgtspannode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index c4e7f426ecac..faeb257bb672 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtextpathnode.hxx>
-#include <svgio/svgreader/svgstyleattributes.hxx>
-#include <svgio/svgreader/svgpathnode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
-#include <svgio/svgreader/svgtrefnode.hxx>
+#include <svgtextpathnode.hxx>
+#include <svgstyleattributes.hxx>
+#include <svgpathnode.hxx>
+#include <svgdocument.hxx>
+#include <svgtrefnode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/textbreakuphelper.hxx>
diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx
index de34e2790c72..36b4cd48b250 100644
--- a/svgio/source/svgreader/svgtitledescnode.cxx
+++ b/svgio/source/svgreader/svgtitledescnode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtitledescnode.hxx>
+#include <svgtitledescnode.hxx>
 
 
 namespace svgio
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index bb9ac17e23cf..af1970b51e8a 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtoken.hxx>
+#include <svgtoken.hxx>
 #include <unordered_map>
 
 namespace svgio
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index b3925c0e1dbb..3ef273fe4e36 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtools.hxx>
+#include <svgtools.hxx>
 #include <osl/thread.h>
 #include <tools/color.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svgio/svgreader/svgtoken.hxx>
+#include <svgtoken.hxx>
 #include <unordered_map>
 
 namespace svgio
diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx
index f698794e9e80..c9325e8a5c9c 100644
--- a/svgio/source/svgreader/svgtrefnode.cxx
+++ b/svgio/source/svgreader/svgtrefnode.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtrefnode.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgtrefnode.hxx>
+#include <svgdocument.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx
index 962f1c8f145d..96a85c156feb 100644
--- a/svgio/source/svgreader/svgtspannode.cxx
+++ b/svgio/source/svgreader/svgtspannode.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgtspannode.hxx>
+#include <svgtspannode.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index 84f4bbe75785..6a055d0fdd22 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svgio/svgreader/svgusenode.hxx>
+#include <svgusenode.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-#include <svgio/svgreader/svgdocument.hxx>
+#include <svgdocument.hxx>
 
 namespace svgio
 {
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index 14f184f87b17..7f2bcac953de 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <svgio/svgreader/svgdocumenthandler.hxx>
+#include <svgdocumenthandler.hxx>
 
 #include "xsvgparser.hxx"