execute move of global headers

see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a

2488 files changed, 10 insertions, 3309 deletions

diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
index fe7770ac3f77..34680afcb748 100644
--- a/animations/Module_animations.mk
+++ b/animations/Module_animations.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,animations))
 
 $(eval $(call gb_Module_add_targets,animations,\
     Library_animcore \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/animations/Package_inc.mk b/animations/Package_inc.mk
deleted file mode 100644
index c72b909f5750..000000000000
--- a/animations/Package_inc.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,animations_inc,$(SRCDIR)/animations/inc))
-
-$(eval $(call gb_Package_add_file,animations_inc,inc/animations/animationnodehelper.hxx,animations/animationnodehelper.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk
index 72caa990b1dd..68cc7f1d47ff 100644
--- a/apple_remote/Module_apple_remote.mk
+++ b/apple_remote/Module_apple_remote.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,apple_remote))
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,apple_remote,\
     Library_AppleRemote \
-    Package_inc \
 ))
 endif
 
diff --git a/apple_remote/Package_inc.mk b/apple_remote/Package_inc.mk
deleted file mode 100644
index e4c3a2123691..000000000000
--- a/apple_remote/Package_inc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,apple_remote_inc,$(SRCDIR)/apple_remote/inc))
-
-$(eval $(call gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteControl.h,apple_remote/RemoteControl.h))
-$(eval $(call gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteMainController.h,apple_remote/RemoteMainController.h))
-
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 2f03dd941017..4888d4adfc9a 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_Module,avmedia))
 $(eval $(call gb_Module_add_targets,avmedia,\
 	AllLangResTarget_avmedia \
 	Library_avmedia \
-	Package_inc \
 ))
 
 ifeq ($(ENABLE_GSTREAMER),TRUE)
diff --git a/avmedia/Package_inc.mk b/avmedia/Package_inc.mk
deleted file mode 100644
index c245ba32cb64..000000000000
--- a/avmedia/Package_inc.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,avmedia_inc,$(SRCDIR)/avmedia/inc))
-
-$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/avmediadllapi.h,avmedia/avmediadllapi.h))
-$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaitem.hxx,avmedia/mediaitem.hxx))
-$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaplayer.hxx,avmedia/mediaplayer.hxx))
-$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediatoolbox.hxx,avmedia/mediatoolbox.hxx))
-$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediawindow.hxx,avmedia/mediawindow.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index b1c45fed11fb..e55ebbbd6988 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,basebmp,\
 endif
 
 $(eval $(call gb_Module_add_targets,basebmp,\
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,basebmp,\
diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk
deleted file mode 100644
index 1be28fa11bd1..000000000000
--- a/basebmp/Package_inc.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc))
-
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/basebmpdllapi.h,basebmp/basebmpdllapi.h))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basegfx/Module_basegfx.mk b/basegfx/Module_basegfx.mk
index d5d63ebac954..c854d995e876 100644
--- a/basegfx/Module_basegfx.mk
+++ b/basegfx/Module_basegfx.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,basegfx))
 
 $(eval $(call gb_Module_add_targets,basegfx,\
     Library_basegfx \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,basegfx,\
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
deleted file mode 100644
index 76d40ab96ba6..000000000000
--- a/basegfx/Package_inc.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,basegfx_inc,$(SRCDIR)/basegfx/inc))
-
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/basegfxdllapi.h,basegfx/basegfxdllapi.h))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolor.hxx,basegfx/color/bcolor.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolormodifier.hxx,basegfx/color/bcolormodifier.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolortools.hxx,basegfx/color/bcolortools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dbeziertools.hxx,basegfx/curve/b2dbeziertools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dcubicbezier.hxx,basegfx/curve/b2dcubicbezier.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrix.hxx,basegfx/matrix/b2dhommatrix.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b2dhommatrixtools.hxx,basegfx/matrix/b2dhommatrixtools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/matrix/b3dhommatrix.hxx,basegfx/matrix/b3dhommatrix.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,basegfx/pixel/bpixel.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,basegfx/point/b2dpoint.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2ipoint.hxx,basegfx/point/b2ipoint.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3dpoint.hxx,basegfx/point/b3dpoint.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b3ipoint.hxx,basegfx/point/b3ipoint.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dlinegeometry.hxx,basegfx/polygon/b2dlinegeometry.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygon.hxx,basegfx/polygon/b2dpolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygonclipper.hxx,basegfx/polygon/b2dpolygonclipper.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygoncutandtouch.hxx,basegfx/polygon/b2dpolygoncutandtouch.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygontools.hxx,basegfx/polygon/b2dpolygontools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygontriangulator.hxx,basegfx/polygon/b2dpolygontriangulator.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygon.hxx,basegfx/polygon/b2dpolypolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygoncutter.hxx,basegfx/polygon/b2dpolypolygoncutter.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygonfillrule.hxx,basegfx/polygon/b2dpolypolygonfillrule.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygontools.hxx,basegfx/polygon/b2dpolypolygontools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dtrapezoid.hxx,basegfx/polygon/b2dtrapezoid.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygon.hxx,basegfx/polygon/b3dpolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygontools.hxx,basegfx/polygon/b3dpolygontools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygon.hxx,basegfx/polygon/b3dpolypolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygontools.hxx,basegfx/polygon/b3dpolypolygontools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1drange.hxx,basegfx/range/b1drange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1ibox.hxx,basegfx/range/b1ibox.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b1irange.hxx,basegfx/range/b1irange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2dconnectedranges.hxx,basegfx/range/b2dconnectedranges.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2dpolyrange.hxx,basegfx/range/b2dpolyrange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drange.hxx,basegfx/range/b2drange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drangeclipper.hxx,basegfx/range/b2drangeclipper.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2drectangle.hxx,basegfx/range/b2drectangle.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2ibox.hxx,basegfx/range/b2ibox.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2irange.hxx,basegfx/range/b2irange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b2irectangle.hxx,basegfx/range/b2irectangle.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3drange.hxx,basegfx/range/b3drange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/b3irange.hxx,basegfx/range/b3irange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/basicbox.hxx,basegfx/range/basicbox.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/range/basicrange.hxx,basegfx/range/basicrange.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/bpixelraster.hxx,basegfx/raster/bpixelraster.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/bzpixelraster.hxx,basegfx/raster/bzpixelraster.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/raster/rasterconvert3d.hxx,basegfx/raster/rasterconvert3d.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/b2dclipstate.hxx,basegfx/tools/b2dclipstate.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/canvastools.hxx,basegfx/tools/canvastools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/keystoplerp.hxx,basegfx/tools/keystoplerp.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/lerp.hxx,basegfx/tools/lerp.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/rectcliptools.hxx,basegfx/tools/rectcliptools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.hxx,basegfx/tools/unopolypolygon.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2dtuple.hxx,basegfx/tuple/b2dtuple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2i64tuple.hxx,basegfx/tuple/b2i64tuple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b2ituple.hxx,basegfx/tuple/b2ituple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3ituple.hxx,basegfx/tuple/b3ituple.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2dsize.hxx,basegfx/vector/b2dsize.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2dvector.hxx,basegfx/vector/b2dvector.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2enums.hxx,basegfx/vector/b2enums.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2isize.hxx,basegfx/vector/b2isize.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b2ivector.hxx,basegfx/vector/b2ivector.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3dvector.hxx,basegfx/vector/b3dvector.hxx))
-$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/vector/b3ivector.hxx,basegfx/vector/b3ivector.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index d94bf160f39c..3dc300535079 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -27,7 +27,6 @@ endif
 
 $(eval $(call gb_Module_add_targets,basic,\
 	Library_sb \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
deleted file mode 100644
index 0bd147917c55..000000000000
--- a/basic/Package_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,basic_inc,$(SRCDIR)/basic/inc))
-
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/basicdllapi.h,basic/basicdllapi.h))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/basicmanagerrepository.hxx,basic/basicmanagerrepository.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/basmgr.hxx,basic/basmgr.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/basrdll.hxx,basic/basrdll.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/modsizeexceeded.hxx,basic/modsizeexceeded.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbdef.hxx,basic/sbdef.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sberrors.hxx,basic/sberrors.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbmeth.hxx,basic/sbmeth.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbmod.hxx,basic/sbmod.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbstar.hxx,basic/sbstar.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbuno.hxx,basic/sbuno.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxcore.hxx,basic/sbxcore.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxdef.hxx,basic/sbxdef.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxfac.hxx,basic/sbxfac.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxform.hxx,basic/sbxform.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbx.hxx,basic/sbx.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/global.hxx,basic/global.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxmeth.hxx,basic/sbxmeth.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxobj.hxx,basic/sbxobj.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxprop.hxx,basic/sbxprop.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/sbxvar.hxx,basic/sbxvar.hxx))
-$(eval $(call gb_Package_add_file,basic_inc,inc/basic/vbahelper.hxx,basic/vbahelper.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 39ffd5b7a09b..a678fafa5f0a 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,canvas,\
 	Library_nullcanvas \
 	Library_simplecanvas \
 	Library_vclcanvas \
-	Package_inc \
 ))
 
 ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk
deleted file mode 100644
index f5fa6b5c2b3d..000000000000
--- a/canvas/Package_inc.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,canvas_inc,$(SRCDIR)/canvas/inc))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bitmapcanvasbase.hxx,canvas/base/bitmapcanvasbase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bufferedgraphicdevicebase.hxx,canvas/base/bufferedgraphicdevicebase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/cachedprimitivebase.hxx,canvas/base/cachedprimitivebase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvasbase.hxx,canvas/base/canvasbase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritebase.hxx,canvas/base/canvascustomspritebase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritehelper.hxx,canvas/base/canvascustomspritehelper.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/graphicdevicebase.hxx,canvas/base/graphicdevicebase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/integerbitmapbase.hxx,canvas/base/integerbitmapbase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/sprite.hxx,canvas/base/sprite.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritecanvasbase.hxx,canvas/base/spritecanvasbase.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritesurface.hxx,canvas/base/spritesurface.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastools.hxx,canvas/canvastools.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canvas/canvastoolsdllapi.h))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icolorbuffer.hxx,canvas/rendering/icolorbuffer.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/irendermodule.hxx,canvas/rendering/irendermodule.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurface.hxx,canvas/rendering/isurface.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxy.hxx,canvas/rendering/isurfaceproxy.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxymanager.hxx,canvas/rendering/isurfaceproxymanager.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/spriteredrawmanager.hxx,canvas/spriteredrawmanager.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/vclwrapper.hxx,canvas/vclwrapper.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verbosetrace.hxx,canvas/verbosetrace.hxx))
-$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verifyinput.hxx,canvas/verifyinput.hxx))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 3bb1f0baeded..6ad80917d451 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,codemaker))
 ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,codemaker,\
-    Package_inc \
     StaticLibrary_codemaker \
     StaticLibrary_codemaker_cpp \
     StaticLibrary_codemaker_java \
diff --git a/codemaker/Package_inc.mk b/codemaker/Package_inc.mk
deleted file mode 100644
index bb438437ecfb..000000000000
--- a/codemaker/Package_inc.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,codemaker_inc,$(SRCDIR)/codemaker/inc))
-
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/codemaker.hxx,codemaker/codemaker.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commoncpp.hxx,codemaker/commoncpp.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commonjava.hxx,codemaker/commonjava.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/commonjava.hxx,codemaker/commonjava.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/exceptiontree.hxx,codemaker/exceptiontree.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/generatedtypeset.hxx,codemaker/generatedtypeset.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/global.hxx,codemaker/global.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/options.hxx,codemaker/options.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/typemanager.hxx,codemaker/typemanager.hxx))
-$(eval $(call gb_Package_add_file,codemaker_inc,inc/codemaker/unotype.hxx,codemaker/unotype.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 57f1e224a5f1..48bf740be481 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Module_Module,comphelper))
 
 $(eval $(call gb_Module_add_targets,comphelper,\
     Library_comphelper \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
deleted file mode 100644
index f03f56d60ce6..000000000000
--- a/comphelper/Package_inc.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,comphelper_inc,$(SRCDIR)/comphelper/inc))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/flagguard.hxx,comphelper/flagguard.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/stlunosequence.hxx,comphelper/stlunosequence.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/documentconstants.hxx,comphelper/documentconstants.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/evtmethodhelper.hxx,comphelper/evtmethodhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/weakbag.hxx,comphelper/weakbag.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/basicio.hxx,comphelper/basicio.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/classids.hxx,comphelper/classids.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/MasterPropertySet.hxx,comphelper/MasterPropertySet.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/stillreadwriteinteraction.hxx,comphelper/stillreadwriteinteraction.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/anycompare.hxx,comphelper/anycompare.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propagg.hxx,comphelper/propagg.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/scopeguard.hxx,comphelper/scopeguard.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/scoped_disposing_ptr.hxx,comphelper/scoped_disposing_ptr.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/xmltools.hxx,comphelper/xmltools.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/asyncnotification.hxx,comphelper/asyncnotification.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/namedvaluecollection.hxx,comphelper/namedvaluecollection.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/mediadescriptor.hxx,comphelper/mediadescriptor.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/synchronousdispatch.hxx,comphelper/synchronousdispatch.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessiblecomponenthelper.hxx,comphelper/accessiblecomponenthelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propmultiplex.hxx,comphelper/propmultiplex.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/servicehelper.hxx,comphelper/servicehelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/servicedecl.hxx,comphelper/servicedecl.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/mimeconfighelper.hxx,comphelper/mimeconfighelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/implbase_var.hxx,comphelper/implbase_var.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/TypeGeneration.hxx,comphelper/TypeGeneration.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/MasterPropertySetInfo.hxx,comphelper/MasterPropertySetInfo.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessiblewrapper.hxx,comphelper/accessiblewrapper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sequence.hxx,comphelper/sequence.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/docpasswordhelper.hxx,comphelper/docpasswordhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertystatecontainer.hxx,comphelper/propertystatecontainer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertysetinfo.hxx,comphelper/propertysetinfo.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accimplaccess.hxx,comphelper/accimplaccess.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/docpasswordrequest.hxx,comphelper/docpasswordrequest.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/extract.hxx,comphelper/extract.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/interaction.hxx,comphelper/interaction.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/uno3.hxx,comphelper/uno3.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/unwrapargs.hxx,comphelper/unwrapargs.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertycontainer.hxx,comphelper/propertycontainer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/guarding.hxx,comphelper/guarding.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/fileformat.h,comphelper/fileformat.h))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/ChainablePropertySetInfo.hxx,comphelper/ChainablePropertySetInfo.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/enumhelper.hxx,comphelper/enumhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/property.hxx,comphelper/property.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertysethelper.hxx,comphelper/propertysethelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessiblekeybindinghelper.hxx,comphelper/accessiblekeybindinghelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertycontainerhelper.hxx,comphelper/propertycontainerhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/make_shared_from_uno.hxx,comphelper/make_shared_from_uno.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/comphelperdllapi.h,comphelper/comphelperdllapi.h))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/listenernotification.hxx,comphelper/listenernotification.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/attributelist.hxx,comphelper/attributelist.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/streamsection.hxx,comphelper/streamsection.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessibletexthelper.hxx,comphelper/accessibletexthelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessibleselectionhelper.hxx,comphelper/accessibleselectionhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/serviceinfohelper.hxx,comphelper/serviceinfohelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/numberedcollection.hxx,comphelper/numberedcollection.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/ChainablePropertySet.hxx,comphelper/ChainablePropertySet.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/stl_types.hxx,comphelper/stl_types.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/eventattachermgr.hxx,comphelper/eventattachermgr.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/componentcontext.hxx,comphelper/componentcontext.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessibleeventnotifier.hxx,comphelper/accessibleeventnotifier.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/ihwrapnofilter.hxx,comphelper/ihwrapnofilter.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sequenceasvector.hxx,comphelper/sequenceasvector.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/officeresourcebundle.hxx,comphelper/officeresourcebundle.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/types.hxx,comphelper/types.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/seekableinput.hxx,comphelper/seekableinput.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/IdPropArrayHelper.hxx,comphelper/IdPropArrayHelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessiblecontexthelper.hxx,comphelper/accessiblecontexthelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/SelectionMultiplex.hxx,comphelper/SelectionMultiplex.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/storagehelper.hxx,comphelper/storagehelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/logging.hxx,comphelper/logging.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sharedmutex.hxx,comphelper/sharedmutex.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/documentinfo.hxx,comphelper/documentinfo.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/weakeventlistener.hxx,comphelper/weakeventlistener.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/containermultiplexer.hxx,comphelper/containermultiplexer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/broadcasthelper.hxx,comphelper/broadcasthelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/numbers.hxx,comphelper/numbers.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/evtlistenerhlp.hxx,comphelper/evtlistenerhlp.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/optional.hxx,comphelper/optional.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/componentbase.hxx,comphelper/componentbase.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/componentguard.hxx,comphelper/componentguard.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/InlineContainer.hxx,comphelper/InlineContainer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propertybag.hxx,comphelper/propertybag.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/embeddedobjectcontainer.hxx,comphelper/embeddedobjectcontainer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/anytostring.hxx,comphelper/anytostring.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/implementationreference.hxx,comphelper/implementationreference.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/proparrhlp.hxx,comphelper/proparrhlp.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/PropertyInfoHash.hxx,comphelper/PropertyInfoHash.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/propstate.hxx,comphelper/propstate.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/proxyaggregation.hxx,comphelper/proxyaggregation.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/oslfile2streamwrap.hxx,comphelper/oslfile2streamwrap.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/genericpropertyset.hxx,comphelper/genericpropertyset.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/makesequence.hxx,comphelper/makesequence.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/ofopxmlhelper.hxx,comphelper/ofopxmlhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/SettingsHelper.hxx,comphelper/SettingsHelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/string.hxx,comphelper/string.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/weak.hxx,comphelper/weak.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/componentmodule.hxx,comphelper/componentmodule.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/container.hxx,comphelper/container.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/seqstream.hxx,comphelper/seqstream.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/namecontainer.hxx,comphelper/namecontainer.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/processfactory.hxx,comphelper/processfactory.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/sequenceashashmap.hxx,comphelper/sequenceashashmap.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/configuration.hxx,comphelper/configuration.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/configurationhelper.hxx,comphelper/configurationhelper.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/newarray.hxx,comphelper/newarray.hxx))
-$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/syntaxhighlight.hxx,comphelper/syntaxhighlight.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 4ca6a6ffc179..61b317078f3c 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 		Library_odbcbase) \
 	Library_sdbc2 \
 	Package_generated \
-	Package_inc \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk
deleted file mode 100644
index bbf5fbb45988..000000000000
--- a/connectivity/Package_inc.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc/connectivity))
-
-# sqlbison.hxx is generated and thus in another package
-$(call gb_Package_get_target,connectivity_inc) : $(call gb_Package_get_target,connectivity_generated)
-
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,BlobHelper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,CommonTools.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ConnectionWrapper.hxx,ConnectionWrapper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbcharset.hxx,dbcharset.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbconversion.hxx,dbconversion.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbexception.hxx,dbexception.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbmetadata.hxx,dbmetadata.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtools.hxx,dbtools.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtoolsdllapi.hxx,dbtoolsdllapi.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DriversConfig.hxx,DriversConfig.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/filtermanager.hxx,filtermanager.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/formattedcolumnvalue.hxx,formattedcolumnvalue.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/FValue.hxx,FValue.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/IParseContext.hxx,IParseContext.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/OSubComponent.hxx,OSubComponent.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ParameterCont.hxx,ParameterCont.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/parameters.hxx,parameters.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/paramwrapper.hxx,paramwrapper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/PColumn.hxx,PColumn.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/predicateinput.hxx,predicateinput.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlerror.hxx,sqlerror.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqliterator.hxx,sqliterator.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlnode.hxx,sqlnode.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlparse.hxx,sqlparse.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/SQLStatementHelper.hxx,SQLStatementHelper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/standardsqlstate.hxx,standardsqlstate.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/statementcomposer.hxx,statementcomposer.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/StdTypeDefs.hxx,StdTypeDefs.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TColumnsHelper.hxx,TColumnsHelper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndex.hxx,TIndex.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexColumns.hxx,TIndexColumns.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexes.hxx,TIndexes.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKey.hxx,TKey.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeyColumns.hxx,TKeyColumns.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeys.hxx,TKeys.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TTableHelper.hxx,TTableHelper.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/virtualdbtools.hxx,virtualdbtools.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/warningscontainer.hxx,warningscontainer.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/IRefreshable.hxx,sdbcx/IRefreshable.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCatalog.hxx,sdbcx/VCatalog.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCollection.hxx,sdbcx/VCollection.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VColumn.hxx,sdbcx/VColumn.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VDescriptor.hxx,sdbcx/VDescriptor.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VGroup.hxx,sdbcx/VGroup.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndex.hxx,sdbcx/VIndex.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndexColumn.hxx,sdbcx/VIndexColumn.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKey.hxx,sdbcx/VKey.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKeyColumn.hxx,sdbcx/VKeyColumn.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTable.hxx,sdbcx/VTable.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTypeDef.hxx,sdbcx/VTypeDef.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VUser.hxx,sdbcx/VUser.hxx))
-$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VView.hxx,sdbcx/VView.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cosv/Module_cosv.mk b/cosv/Module_cosv.mk
index 9c9e242d5ef0..31351a6aa484 100644
--- a/cosv/Module_cosv.mk
+++ b/cosv/Module_cosv.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,cosv))
 ifneq (,$(filter ODK,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,cosv,\
-    Package_inc \
     StaticLibrary_cosv \
 ))
 
diff --git a/cosv/Package_inc.mk b/cosv/Package_inc.mk
deleted file mode 100644
index fa22956bc5ba..000000000000
--- a/cosv/Package_inc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-$(eval $(call gb_Package_Package,cosv_inc,$(SRCDIR)/cosv/inc))
-
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_precomp.h,cosv/csv_precomp.h))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/bstream.hxx,cosv/bstream.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comdline.hxx,cosv/comdline.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/comfunc.hxx,cosv/comfunc.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_env.hxx,cosv/csv_env.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/csv_ostream.hxx,cosv/csv_ostream.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/dirchain.hxx,cosv/dirchain.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/file.hxx,cosv/file.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/openclose.hxx,cosv/openclose.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/persist.hxx,cosv/persist.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc_dir.hxx,cosv/ploc_dir.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/ploc.hxx,cosv/ploc.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/plocroot.hxx,cosv/plocroot.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/std_outp.hxx,cosv/std_outp.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/streamstr.hxx,cosv/streamstr.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/stringdata.hxx,cosv/stringdata.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/string.hxx,cosv/string.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/str_types.hxx,cosv/str_types.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/x.hxx,cosv/x.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/dyn.hxx,cosv/tpl/dyn.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/processor.hxx,cosv/tpl/processor.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/swelist.hxx,cosv/tpl/swelist.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/tpltools.hxx,cosv/tpl/tpltools.hxx))
-$(eval $(call gb_Package_add_file,cosv_inc,inc/cosv/tpl/vvector.hxx,cosv/tpl/vvector.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index fc310b282271..fad05f1c60a0 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_Module,cppcanvas))
 $(eval $(call gb_Module_add_targets,cppcanvas,\
 	Library_cppcanvas \
 	Library_mtfrenderer \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Package_inc.mk b/cppcanvas/Package_inc.mk
deleted file mode 100644
index 759cd30fa2bc..000000000000
--- a/cppcanvas/Package_inc.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,cppcanvas_inc,$(SRCDIR)/cppcanvas/inc))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvas.hxx,cppcanvas/canvas.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/sprite.hxx,cppcanvas/sprite.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/vclfactory.hxx,cppcanvas/vclfactory.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/font.hxx,cppcanvas/font.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/customsprite.hxx,cppcanvas/customsprite.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvasgraphic.hxx,cppcanvas/canvasgraphic.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/polypolygon.hxx,cppcanvas/polypolygon.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/color.hxx,cppcanvas/color.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/spritecanvas.hxx,cppcanvas/spritecanvas.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/text.hxx,cppcanvas/text.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/renderer.hxx,cppcanvas/renderer.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/basegfxfactory.hxx,cppcanvas/basegfxfactory.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmap.hxx,cppcanvas/bitmap.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmapcanvas.hxx,cppcanvas/bitmapcanvas.hxx))
-$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/cppcanvasdllapi.h,cppcanvas/cppcanvasdllapi.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/drawinglayer/Module_drawinglayer.mk b/drawinglayer/Module_drawinglayer.mk
index 567fac5884f8..52f2482fc714 100644
--- a/drawinglayer/Module_drawinglayer.mk
+++ b/drawinglayer/Module_drawinglayer.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,drawinglayer))
 
 $(eval $(call gb_Module_add_targets,drawinglayer,\
     Library_drawinglayer \
-    Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk
deleted file mode 100644
index 56b7f0a3cbe9..000000000000
--- a/drawinglayer/Package_inc.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,drawinglayer_inc,$(SRCDIR)/drawinglayer/inc))
-
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/animation/animationtiming.hxx,drawinglayer/animation/animationtiming.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillbitmapattribute.hxx,drawinglayer/attribute/fillbitmapattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillgradientattribute.hxx,drawinglayer/attribute/fillgradientattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillhatchattribute.hxx,drawinglayer/attribute/fillhatchattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fontattribute.hxx,drawinglayer/attribute/fontattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/lineattribute.hxx,drawinglayer/attribute/lineattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/linestartendattribute.hxx,drawinglayer/attribute/linestartendattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/materialattribute3d.hxx,drawinglayer/attribute/materialattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrallattribute3d.hxx,drawinglayer/attribute/sdrallattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillattribute.hxx,drawinglayer/attribute/sdrfillattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx,drawinglayer/attribute/sdrfillbitmapattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightattribute3d.hxx,drawinglayer/attribute/sdrlightattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightingattribute3d.hxx,drawinglayer/attribute/sdrlightingattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlineattribute.hxx,drawinglayer/attribute/sdrlineattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlinestartendattribute.hxx,drawinglayer/attribute/sdrlinestartendattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrobjectattribute3d.hxx,drawinglayer/attribute/sdrobjectattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrsceneattribute3d.hxx,drawinglayer/attribute/sdrsceneattribute3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrshadowattribute.hxx,drawinglayer/attribute/sdrshadowattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/strokeattribute.hxx,drawinglayer/attribute/strokeattribute.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/drawinglayerdllapi.h,drawinglayer/drawinglayerdllapi.h))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation2d.hxx,drawinglayer/geometry/viewinformation2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation3d.hxx,drawinglayer/geometry/viewinformation3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/animatedprimitive2d.hxx,drawinglayer/primitive2d/animatedprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx,drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/baseprimitive2d.hxx,drawinglayer/primitive2d/baseprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx,drawinglayer/primitive2d/bitmapprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx,drawinglayer/primitive2d/borderlineprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx,drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/controlprimitive2d.hxx,drawinglayer/primitive2d/controlprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/cropprimitive2d.hxx,drawinglayer/primitive2d/cropprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx,drawinglayer/primitive2d/discretebitmapprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx,drawinglayer/primitive2d/discreteshadowprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx,drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx,drawinglayer/primitive2d/embedded3dprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/epsprimitive2d.hxx,drawinglayer/primitive2d/epsprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx,drawinglayer/primitive2d/fillbitmapprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx,drawinglayer/primitive2d/fillgradientprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx,drawinglayer/primitive2d/fillhatchprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/graphicprimitive2d.hxx,drawinglayer/primitive2d/graphicprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/gridprimitive2d.hxx,drawinglayer/primitive2d/gridprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/groupprimitive2d.hxx,drawinglayer/primitive2d/groupprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/helplineprimitive2d.hxx,drawinglayer/primitive2d/helplineprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx,drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/invertprimitive2d.hxx,drawinglayer/primitive2d/invertprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx,drawinglayer/primitive2d/markerarrayprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/maskprimitive2d.hxx,drawinglayer/primitive2d/maskprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/mediaprimitive2d.hxx,drawinglayer/primitive2d/mediaprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx,drawinglayer/primitive2d/objectinfoprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx,drawinglayer/primitive2d/patternfillprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polygonprimitive2d.hxx,drawinglayer/primitive2d/polygonprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx,drawinglayer/primitive2d/polypolygonprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/primitivetools2d.hxx,drawinglayer/primitive2d/primitivetools2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sceneprimitive2d.hxx,drawinglayer/primitive2d/sceneprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx,drawinglayer/primitive2d/sdrdecompositiontools2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/shadowprimitive2d.hxx,drawinglayer/primitive2d/shadowprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx,drawinglayer/primitive2d/structuretagprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx,drawinglayer/primitive2d/svggradientprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textbreakuphelper.hxx,drawinglayer/primitive2d/textbreakuphelper.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx,drawinglayer/primitive2d/textdecoratedprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx,drawinglayer/primitive2d/texteffectprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx,drawinglayer/primitive2d/textenumsprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx,drawinglayer/primitive2d/texthierarchyprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlayoutdevice.hxx,drawinglayer/primitive2d/textlayoutdevice.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlineprimitive2d.hxx,drawinglayer/primitive2d/textlineprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlineprimitive2d.hxx,drawinglayer/primitive2d/textlineprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textprimitive2d.hxx,drawinglayer/primitive2d/textprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx,drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx,drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transformprimitive2d.hxx,drawinglayer/primitive2d/transformprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx,drawinglayer/primitive2d/transparenceprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx,drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx,drawinglayer/primitive2d/wallpaperprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx,drawinglayer/primitive2d/wrongspellprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/baseprimitive3d.hxx,drawinglayer/primitive3d/baseprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx,drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/groupprimitive3d.hxx,drawinglayer/primitive3d/groupprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx,drawinglayer/primitive3d/hatchtextureprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx,drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx,drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx,drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygonprimitive3d.hxx,drawinglayer/primitive3d/polygonprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx,drawinglayer/primitive3d/polygontubeprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx,drawinglayer/primitive3d/polypolygonprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx,drawinglayer/primitive3d/sdrcubeprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx,drawinglayer/primitive3d/sdrdecompositiontools3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx,drawinglayer/primitive3d/sdrextrudelathetools3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx,drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx,drawinglayer/primitive3d/sdrlatheprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx,drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrprimitive3d.hxx,drawinglayer/primitive3d/sdrprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx,drawinglayer/primitive3d/sdrsphereprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/shadowprimitive3d.hxx,drawinglayer/primitive3d/shadowprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/textureprimitive3d.hxx,drawinglayer/primitive3d/textureprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/transformprimitive3d.hxx,drawinglayer/primitive3d/transformprimitive3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/baseprocessor2d.hxx,drawinglayer/processor2d/baseprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/canvasprocessor.hxx,drawinglayer/processor2d/canvasprocessor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/contourextractor2d.hxx,drawinglayer/processor2d/contourextractor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/processorfromoutputdevice.hxx,drawinglayer/processor2d/processorfromoutputdevice.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/linegeometryextractor2d.hxx,drawinglayer/processor2d/linegeometryextractor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/objectinfoextractor2d.hxx,drawinglayer/processor2d/objectinfoextractor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx,drawinglayer/processor2d/textaspolygonextractor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx,drawinglayer/processor2d/vclmetafileprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx,drawinglayer/processor2d/vclpixelprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclprocessor2d.hxx,drawinglayer/processor2d/vclprocessor2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/defaultprocessor3d.hxx,drawinglayer/processor3d/defaultprocessor3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/zbufferprocessor3d.hxx,drawinglayer/processor3d/zbufferprocessor3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture3d.hxx,drawinglayer/texture/texture3d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture.hxx,drawinglayer/texture/texture.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/tools/converters.hxx,drawinglayer/tools/converters.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/XShapeDumper.hxx,drawinglayer/XShapeDumper.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index d507c6ecc5d9..4c760bf0a100 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_Module,editeng))
 $(eval $(call gb_Module_add_targets,editeng,\
     AllLangResTarget_editeng \
     Library_editeng \
-    Package_inc \
 ))
 
 # add any runtime tests (unit tests) here
diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
deleted file mode 100644
index 4794507ca193..000000000000
--- a/editeng/Package_inc.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,editeng_inc,$(SRCDIR)/editeng/inc))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleComponentBase.hxx,editeng/AccessibleComponentBase.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleContextBase.hxx,editeng/AccessibleContextBase.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleEditableTextPara.hxx,editeng/AccessibleEditableTextPara.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleImageBullet.hxx,editeng/AccessibleImageBullet.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleParaManager.hxx,editeng/AccessibleParaManager.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBase.hxx,editeng/AccessibleSelectionBase.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjustitem.hxx,editeng/adjustitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/autokernitem.hxx,editeng/autokernitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blinkitem.hxx,editeng/blinkitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lineitem.hxx,editeng/lineitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/formatbreakitem.hxx,editeng/formatbreakitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brushitem.hxx,editeng/brushitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulletitem.hxx,editeng/bulletitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/contouritem.hxx,editeng/contouritem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crossedoutitem.hxx,editeng/crossedoutitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charsetcoloritem.hxx,editeng/charsetcoloritem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editerr.hxx,editeng/editerr.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editids.hrc,editeng/editids.hrc))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editobj.hxx,editeng/editobj.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editrids.hrc,editeng/editrids.hrc))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editstat.hxx,editeng/editstat.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editund2.hxx,editeng/editund2.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editview.hxx,editeng/editview.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/edtdlg.hxx,editeng/edtdlg.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eedata.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphasismarkitem.hxx,editeng/emphasismarkitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escapementitem.hxx,editeng/escapementitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fieldupdater.hxx,editeng/fieldupdater.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flstitem.hxx,editeng/flstitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fontitem.hxx,editeng/fontitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddencharacterstable.hxx,editeng/forbiddencharacterstable.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddenruleitem.hxx,editeng/forbiddenruleitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdir.hxx,editeng/frmdir.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng/frmdiritem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyphenzoneitem.hxx,editeng/hyphenzoneitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/justifyitem.hxx,editeng/justifyitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/kernitem.hxx,editeng/kernitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/langitem.hxx,editeng/langitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lcolitem.hxx,editeng/lcolitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lrspitem.hxx,editeng/lrspitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lspcitem.hxx,editeng/lspcitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/macros.hxx,editeng/macros.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/measfld.hxx,editeng/measfld.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/memberids.hrc,editeng/memberids.hrc))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/mutxhelp.hxx,editeng/mutxhelp.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nhypitem.hxx,editeng/nhypitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nlbkitem.hxx,editeng/nlbkitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numdef.hxx,editeng/numdef.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numitem.hxx,editeng/numitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/opaqitem.hxx,editeng/opaqitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/optitems.hxx,editeng/optitems.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/orphitem.hxx,editeng/orphitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outliner.hxx,editeng/outliner.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outlobj.hxx,editeng/outlobj.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paperinf.hxx,editeng/paperinf.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paragraphdata.hxx,editeng/paragraphdata.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paravertalignitem.hxx,editeng/paravertalignitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pbinitem.hxx,editeng/pbinitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pgrditem.hxx,editeng/pgrditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pmdlitem.hxx,editeng/pmdlitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/postitem.hxx,editeng/postitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prntitem.hxx,editeng/prntitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/protitem.hxx,editeng/protitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prszitem.hxx,editeng/prszitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/rsiditem.hxx,editeng/rsiditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scriptspaceitem.hxx,editeng/scriptspaceitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scripttypeitem.hxx,editeng/scripttypeitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shaditem.hxx,editeng/shaditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shdditem.hxx,editeng/shdditem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/sizeitem.hxx,editeng/sizeitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/SpellPortions.hxx,editeng/SpellPortions.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/spltitem.hxx,editeng/spltitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/splwrap.hxx,editeng/splwrap.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxacorr.hxx,editeng/svxacorr.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxenum.hxx,editeng/svxenum.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxfont.hxx,editeng/svxfont.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxrtf.hxx,editeng/svxrtf.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/swafopt.hxx,editeng/swafopt.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/tstpitem.hxx,editeng/tstpitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/twolinesitem.hxx,editeng/twolinesitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/txtrange.hxx,editeng/txtrange.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/udlnitem.hxx,editeng/udlnitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/ulspitem.hxx,editeng/ulspitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedhlp.hxx,editeng/unoedhlp.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedprx.hxx,editeng/unoedprx.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedsrc.hxx,editeng/unoedsrc.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofdesc.hxx,editeng/unofdesc.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofield.hxx,editeng/unofield.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/UnoForbiddenCharsTable.hxx,editeng/UnoForbiddenCharsTable.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofored.hxx,editeng/unofored.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoforou.hxx,editeng/unoforou.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoipset.hxx,editeng/unoipset.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unolingu.hxx,editeng/unolingu.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unonrule.hxx,editeng/unonrule.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unopracc.hxx,editeng/unopracc.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoprnms.hxx,editeng/unoprnms.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unotext.hxx,editeng/unotext.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwou.hxx,editeng/unoviwou.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wghtitem.hxx,editeng/wghtitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/widwitem.hxx,editeng/widwitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/writingmodeitem.hxx,editeng/writingmodeitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wrlmitem.hxx,editeng/wrlmitem.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/xmlcnitm.hxx,editeng/xmlcnitm.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/LookupTree.hxx,editeng/LookupTree.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/Node.hxx,editeng/Node.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/TreeHead.hxx,editeng/TreeHead.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/LatinLookupTree.hxx,editeng/LatinLookupTree.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/LatinTreeNode.hxx,editeng/LatinTreeNode.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 4f241d75e9b2..5fd6c070bb28 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Library_xmlfd \
 	Library_xsltdlg \
 	Library_xsltfilter \
-	Package_inc \
 	Package_docbook \
 	Package_xslt \
 	UIConfig_xsltdlg \
diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk
deleted file mode 100644
index f14893df1b61..000000000000
--- a/filter/Package_inc.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,filter_inc,$(SRCDIR)/filter/inc))
-
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfilterdllapi.h,filter/msfilter/msfilterdllapi.h))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,filter/msfilter/countryid.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/dffpropset.hxx,filter/msfilter/dffpropset.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/dffrecordheader.hxx,filter/msfilter/dffrecordheader.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msvbahelper.hxx,filter/msfilter/msvbahelper.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svdfppt.hxx,filter/msfilter/svdfppt.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svxmsbas.hxx,filter/msfilter/svxmsbas.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/rtfutil.hxx,filter/msfilter/rtfutil.hxx))
-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/util.hxx,filter/msfilter/util.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk
index 381ce0901ffd..a19406f6685b 100644
--- a/formula/Module_formula.mk
+++ b/formula/Module_formula.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Module_add_targets,formula,\
     AllLangResTarget_forui \
     Library_for \
     Library_forui \
-    Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
deleted file mode 100644
index b2dbc85e382a..000000000000
--- a/formula/Package_inc.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,formula_inc,$(SRCDIR)/formula/inc/formula))
-
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/compiler.hrc,compiler.hrc))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/errorcodes.hxx,errorcodes.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/ExternalReferenceHelper.hxx,ExternalReferenceHelper.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formdata.hxx,formdata.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaCompiler.hxx,FormulaCompiler.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formuladllapi.h,formuladllapi.h))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formulahelper.hxx,formulahelper.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formula.hxx,formula.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaOpCodeMapperObj.hxx,FormulaOpCodeMapperObj.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,funcutl.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,grammar.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,IControlReferenceHandler.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,IFunctionDescription.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/omoduleclient.hxx,omoduleclient.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,opcode.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,tokenarray.hxx))
-$(eval $(call gb_Package_add_file,formula_inc,inc/formula/token.hxx,token.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 66e645fb0ec1..a95d9f2052ba 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,framework,\
     Library_fwl \
     Library_fwm \
     Package_dtd \
-    Package_inc \
     UIConfig_startmodule \
 ))
 
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
deleted file mode 100644
index 2d210c2ee23e..000000000000
--- a/framework/Package_inc.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/framelistanalyzer.hxx,framework/framelistanalyzer.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/documentundoguard.hxx,framework/documentundoguard.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/undomanagerhelper.hxx,framework/undomanagerhelper.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imutex.hxx,framework/imutex.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/iguard.hxx,framework/iguard.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,framework/fwedllapi.h))
-$(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h))
-$(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk
index c16f50f4576a..edd2e1d2e2a9 100644
--- a/i18nlangtag/Module_i18nlangtag.mk
+++ b/i18nlangtag/Module_i18nlangtag.mk
@@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,i18nlangtag))
 
 $(eval $(call gb_Module_add_targets,i18nlangtag,\
 	Library_i18nlangtag \
-	Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18nlangtag,\
diff --git a/i18nlangtag/Package_inc.mk b/i18nlangtag/Package_inc.mk
deleted file mode 100644
index 984faf4e21b3..000000000000
--- a/i18nlangtag/Package_inc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,i18nlangtag_inc,$(SRCDIR)/i18nlangtag/inc))
-
-$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/i18nlangtagdllapi.h,i18nlangtag/i18nlangtagdllapi.h))
-$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/lang.h,i18nlangtag/lang.h))
-$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/languagetag.hxx,i18nlangtag/languagetag.hxx))
-$(eval $(call gb_Package_add_file,i18nlangtag_inc,inc/i18nlangtag/mslangid.hxx,i18nlangtag/mslangid.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18nutil/Module_i18nutil.mk b/i18nutil/Module_i18nutil.mk
index aa67867d69d3..9b543dfdc359 100644
--- a/i18nutil/Module_i18nutil.mk
+++ b/i18nutil/Module_i18nutil.mk
@@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,i18nutil))
 
 $(eval $(call gb_Module_add_targets,i18nutil,\
 	Library_i18nutil \
-	Package_inc \
 ))
 
 # vim: set noet sw=4:
diff --git a/i18nutil/Package_inc.mk b/i18nutil/Package_inc.mk
deleted file mode 100644
index 82b64e782b7f..000000000000
--- a/i18nutil/Package_inc.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,i18nutil_inc,$(SRCDIR)/i18nutil/inc))
-
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/i18nutildllapi.h,i18nutil/i18nutildllapi.h))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/casefolding.hxx,i18nutil/casefolding.hxx))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/oneToOneMapping.hxx,i18nutil/oneToOneMapping.hxx))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/paper.hxx,i18nutil/paper.hxx))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/scripttypedetector.hxx,i18nutil/scripttypedetector.hxx))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/unicode.hxx,i18nutil/unicode.hxx))
-$(eval $(call gb_Package_add_file,i18nutil_inc,inc/i18nutil/widthfolding.hxx,i18nutil/widthfolding.hxx))
-
-# vim: set noet sw=4:
diff --git a/animations/inc/animations/animationnodehelper.hxx b/include/animations/animationnodehelper.hxx
index d6f000d5dd40..d6f000d5dd40 100644
--- a/animations/inc/animations/animationnodehelper.hxx
+++ b/include/animations/animationnodehelper.hxx
diff --git a/apple_remote/inc/apple_remote/RemoteControl.h b/include/apple_remote/RemoteControl.h
index 6e2c67765890..6e2c67765890 100644
--- a/apple_remote/inc/apple_remote/RemoteControl.h
+++ b/include/apple_remote/RemoteControl.h
diff --git a/apple_remote/inc/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h
index 5fde4639c155..5fde4639c155 100644
--- a/apple_remote/inc/apple_remote/RemoteMainController.h
+++ b/include/apple_remote/RemoteMainController.h
diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h
index 351b82854a7f..351b82854a7f 100644
--- a/avmedia/inc/avmedia/avmediadllapi.h
+++ b/include/avmedia/avmediadllapi.h
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index f14281999307..f14281999307 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx
index b823f7c63b67..b823f7c63b67 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/include/avmedia/mediaplayer.hxx
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index 570167024aff..570167024aff 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index a5cb5dc8e7a8..a5cb5dc8e7a8 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
diff --git a/basebmp/inc/basebmp/accessor.hxx b/include/basebmp/accessor.hxx
index 0ef3b5716465..0ef3b5716465 100644
--- a/basebmp/inc/basebmp/accessor.hxx
+++ b/include/basebmp/accessor.hxx
diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/include/basebmp/accessoradapters.hxx
index f4a05dc331c2..f4a05dc331c2 100644
--- a/basebmp/inc/basebmp/accessoradapters.hxx
+++ b/include/basebmp/accessoradapters.hxx
diff --git a/basebmp/inc/basebmp/accessorfunctors.hxx b/include/basebmp/accessorfunctors.hxx
index 58550b010512..58550b010512 100644
--- a/basebmp/inc/basebmp/accessorfunctors.hxx
+++ b/include/basebmp/accessorfunctors.hxx
diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/include/basebmp/accessortraits.hxx
index 4ce9e6926e35..4ce9e6926e35 100644
--- a/basebmp/inc/basebmp/accessortraits.hxx
+++ b/include/basebmp/accessortraits.hxx
diff --git a/basebmp/inc/basebmp/basebmpdllapi.h b/include/basebmp/basebmpdllapi.h
index c44eee01ce7b..c44eee01ce7b 100644
--- a/basebmp/inc/basebmp/basebmpdllapi.h
+++ b/include/basebmp/basebmpdllapi.h
diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 941b01c840c3..941b01c840c3 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/include/basebmp/clippedlinerenderer.hxx
index 92ca167730f5..92ca167730f5 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/include/basebmp/clippedlinerenderer.hxx
diff --git a/basebmp/inc/basebmp/color.hxx b/include/basebmp/color.hxx
index 52451fff7fed..52451fff7fed 100644
--- a/basebmp/inc/basebmp/color.hxx
+++ b/include/basebmp/color.hxx
diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/include/basebmp/colorblendaccessoradapter.hxx
index c4511c709844..c4511c709844 100644
--- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
+++ b/include/basebmp/colorblendaccessoradapter.hxx
diff --git a/basebmp/inc/basebmp/colormisc.hxx b/include/basebmp/colormisc.hxx
index d2142968d3ba..d2142968d3ba 100644
--- a/basebmp/inc/basebmp/colormisc.hxx
+++ b/include/basebmp/colormisc.hxx
diff --git a/basebmp/inc/basebmp/colortraits.hxx b/include/basebmp/colortraits.hxx
index bcbc8f9b259d..bcbc8f9b259d 100644
--- a/basebmp/inc/basebmp/colortraits.hxx
+++ b/include/basebmp/colortraits.hxx
diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/include/basebmp/compositeiterator.hxx
index 4fb9c10f0bb4..4fb9c10f0bb4 100644
--- a/basebmp/inc/basebmp/compositeiterator.hxx
+++ b/include/basebmp/compositeiterator.hxx
diff --git a/basebmp/inc/basebmp/debug.hxx b/include/basebmp/debug.hxx
index 688daf41c834..688daf41c834 100644
--- a/basebmp/inc/basebmp/debug.hxx
+++ b/include/basebmp/debug.hxx
diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/include/basebmp/drawmodes.hxx
index a5f98ed3d418..a5f98ed3d418 100644
--- a/basebmp/inc/basebmp/drawmodes.hxx
+++ b/include/basebmp/drawmodes.hxx
diff --git a/basebmp/inc/basebmp/endian.hxx b/include/basebmp/endian.hxx
index 22c32b6077ac..22c32b6077ac 100644
--- a/basebmp/inc/basebmp/endian.hxx
+++ b/include/basebmp/endian.hxx
diff --git a/basebmp/inc/basebmp/fillimage.hxx b/include/basebmp/fillimage.hxx
index 815ec32539bf..815ec32539bf 100644
--- a/basebmp/inc/basebmp/fillimage.hxx
+++ b/include/basebmp/fillimage.hxx
diff --git a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/include/basebmp/genericcolorimageaccessor.hxx
index 5aaa95327176..5aaa95327176 100644
--- a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
+++ b/include/basebmp/genericcolorimageaccessor.hxx
diff --git a/basebmp/inc/basebmp/greylevelformats.hxx b/include/basebmp/greylevelformats.hxx
index 3fcd90fcda5f..3fcd90fcda5f 100644
--- a/basebmp/inc/basebmp/greylevelformats.hxx
+++ b/include/basebmp/greylevelformats.hxx
diff --git a/basebmp/inc/basebmp/iteratortraits.hxx b/include/basebmp/iteratortraits.hxx
index 5d87df7d5a85..5d87df7d5a85 100644
--- a/basebmp/inc/basebmp/iteratortraits.hxx
+++ b/include/basebmp/iteratortraits.hxx
diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/include/basebmp/metafunctions.hxx
index e451dce8e4d9..e451dce8e4d9 100644
--- a/basebmp/inc/basebmp/metafunctions.hxx
+++ b/include/basebmp/metafunctions.hxx
diff --git a/basebmp/inc/basebmp/nonstandarditerator.hxx b/include/basebmp/nonstandarditerator.hxx
index ff51c59afcee..ff51c59afcee 100644
--- a/basebmp/inc/basebmp/nonstandarditerator.hxx
+++ b/include/basebmp/nonstandarditerator.hxx
diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
index 89a88506bbcd..89a88506bbcd 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/include/basebmp/packedpixeliterator.hxx
diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/include/basebmp/paletteformats.hxx
index 5c2c58d49b94..5c2c58d49b94 100644
--- a/basebmp/inc/basebmp/paletteformats.hxx
+++ b/include/basebmp/paletteformats.hxx
diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/include/basebmp/paletteimageaccessor.hxx
index 6f0164e64af6..6f0164e64af6 100644
--- a/basebmp/inc/basebmp/paletteimageaccessor.hxx
+++ b/include/basebmp/paletteimageaccessor.hxx
diff --git a/basebmp/inc/basebmp/pixelformatadapters.hxx b/include/basebmp/pixelformatadapters.hxx
index 09cc9368394d..09cc9368394d 100644
--- a/basebmp/inc/basebmp/pixelformatadapters.hxx
+++ b/include/basebmp/pixelformatadapters.hxx
diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/include/basebmp/pixeliterator.hxx
index e629af275dd9..e629af275dd9 100644
--- a/basebmp/inc/basebmp/pixeliterator.hxx
+++ b/include/basebmp/pixeliterator.hxx
diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx
index 80f73ac01279..80f73ac01279 100644
--- a/basebmp/inc/basebmp/polypolygonrenderer.hxx
+++ b/include/basebmp/polypolygonrenderer.hxx
diff --git a/basebmp/inc/basebmp/rgb24pixelformats.hxx b/include/basebmp/rgb24pixelformats.hxx
index c4f460cc5e10..c4f460cc5e10 100644
--- a/basebmp/inc/basebmp/rgb24pixelformats.hxx
+++ b/include/basebmp/rgb24pixelformats.hxx
diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/include/basebmp/rgbmaskpixelformats.hxx
index 19cf65f97e0d..19cf65f97e0d 100644
--- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
+++ b/include/basebmp/rgbmaskpixelformats.hxx
diff --git a/basebmp/inc/basebmp/scaleimage.hxx b/include/basebmp/scaleimage.hxx
index fc9022357fe6..fc9022357fe6 100644
--- a/basebmp/inc/basebmp/scaleimage.hxx
+++ b/include/basebmp/scaleimage.hxx
diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx
index a1708980b5ac..a1708980b5ac 100644
--- a/basebmp/inc/basebmp/scanlineformats.hxx
+++ b/include/basebmp/scanlineformats.hxx
diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/include/basebmp/stridedarrayiterator.hxx
index 6f5772e527c6..6f5772e527c6 100644
--- a/basebmp/inc/basebmp/stridedarrayiterator.hxx
+++ b/include/basebmp/stridedarrayiterator.hxx
diff --git a/basebmp/inc/basebmp/tools.hxx b/include/basebmp/tools.hxx
index 31854a1d5e25..31854a1d5e25 100644
--- a/basebmp/inc/basebmp/tools.hxx
+++ b/include/basebmp/tools.hxx
diff --git a/basegfx/inc/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h
index b71f0755d277..b71f0755d277 100644
--- a/basegfx/inc/basegfx/basegfxdllapi.h
+++ b/include/basegfx/basegfxdllapi.h
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 9b91e212ec89..9b91e212ec89 100644
--- a/basegfx/inc/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 4b6f04efc8e9..4b6f04efc8e9 100644
--- a/basegfx/inc/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx
index 42ac7aafb3cc..42ac7aafb3cc 100644
--- a/basegfx/inc/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx
index f52f00a1912f..f52f00a1912f 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/include/basegfx/curve/b2dbeziertools.hxx
diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx
index 003a1970bb0a..003a1970bb0a 100644
--- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx
index 30204b91fad5..30204b91fad5 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx
index ed255360f831..ed255360f831 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx
index 037d400d674f..037d400d674f 100644
--- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
+++ b/include/basegfx/matrix/b3dhommatrix.hxx
diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 70dcabe1a190..70dcabe1a190 100644
--- a/basegfx/inc/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index a2c59101fa78..a2c59101fa78 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx
index ef73c8ab46c9..ef73c8ab46c9 100644
--- a/basegfx/inc/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 33b225a2a36d..33b225a2a36d 100644
--- a/basegfx/inc/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx
index 391bc128b9fb..391bc128b9fb 100644
--- a/basegfx/inc/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx b/include/basegfx/point/b3ipoint.hxx
index e80514c13de2..e80514c13de2 100644
--- a/basegfx/inc/basegfx/point/b3ipoint.hxx
+++ b/include/basegfx/point/b3ipoint.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index 934158f88a2f..934158f88a2f 100644
--- a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index 7c854fdc8a0e..7c854fdc8a0e 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx
index 197958e45a00..197958e45a00 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/include/basegfx/polygon/b2dpolygonclipper.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 05f8e0e0cb3a..05f8e0e0cb3a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index dce479847d65..dce479847d65 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx
index 5af34ae1ecd2..5af34ae1ecd2 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx
index cd22644ab8ce..cd22644ab8ce 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
index 31bd8b6279f9..31bd8b6279f9 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
index 390dd9bac9f0..390dd9bac9f0 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
+++ b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 29ae3e042133..29ae3e042133 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index 43ee9fb37f6c..43ee9fb37f6c 100644
--- a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 7199eea9684c..7199eea9684c 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index 9ed32b42fb90..9ed32b42fb90 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx
index d67da6ad690b..d67da6ad690b 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
+++ b/include/basegfx/polygon/b3dpolypolygon.hxx
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index a50167f9b4de..a50167f9b4de 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/include/basegfx/range/b1drange.hxx
index ffe704a1b845..ffe704a1b845 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/include/basegfx/range/b1drange.hxx
diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/include/basegfx/range/b1ibox.hxx
index 7c81e37c1288..7c81e37c1288 100644
--- a/basegfx/inc/basegfx/range/b1ibox.hxx
+++ b/include/basegfx/range/b1ibox.hxx
diff --git a/basegfx/inc/basegfx/range/b1irange.hxx b/include/basegfx/range/b1irange.hxx
index 0ba5878fb0c8..0ba5878fb0c8 100644
--- a/basegfx/inc/basegfx/range/b1irange.hxx
+++ b/include/basegfx/range/b1irange.hxx
diff --git a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx
index f1d65196bd8f..f1d65196bd8f 100644
--- a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
+++ b/include/basegfx/range/b2dconnectedranges.hxx
diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/include/basegfx/range/b2dpolyrange.hxx
index b910062d11a3..b910062d11a3 100644
--- a/basegfx/inc/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx
index 1f3884c1c9ce..1f3884c1c9ce 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/include/basegfx/range/b2drange.hxx
diff --git a/basegfx/inc/basegfx/range/b2drangeclipper.hxx b/include/basegfx/range/b2drangeclipper.hxx
index 99bc8763369d..99bc8763369d 100644
--- a/basegfx/inc/basegfx/range/b2drangeclipper.hxx
+++ b/include/basegfx/range/b2drangeclipper.hxx
diff --git a/basegfx/inc/basegfx/range/b2drectangle.hxx b/include/basegfx/range/b2drectangle.hxx
index 8d4715d64410..8d4715d64410 100644
--- a/basegfx/inc/basegfx/range/b2drectangle.hxx
+++ b/include/basegfx/range/b2drectangle.hxx
diff --git a/basegfx/inc/basegfx/range/b2ibox.hxx b/include/basegfx/range/b2ibox.hxx
index 7c182a4ab327..7c182a4ab327 100644
--- a/basegfx/inc/basegfx/range/b2ibox.hxx
+++ b/include/basegfx/range/b2ibox.hxx
diff --git a/basegfx/inc/basegfx/range/b2irange.hxx b/include/basegfx/range/b2irange.hxx
index 60f9fc79fa67..60f9fc79fa67 100644
--- a/basegfx/inc/basegfx/range/b2irange.hxx
+++ b/include/basegfx/range/b2irange.hxx
diff --git a/basegfx/inc/basegfx/range/b2irectangle.hxx b/include/basegfx/range/b2irectangle.hxx
index 40792732ab1d..40792732ab1d 100644
--- a/basegfx/inc/basegfx/range/b2irectangle.hxx
+++ b/include/basegfx/range/b2irectangle.hxx
diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index 7b17f04e4964..7b17f04e4964 100644
--- a/basegfx/inc/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
diff --git a/basegfx/inc/basegfx/range/b3irange.hxx b/include/basegfx/range/b3irange.hxx
index 558c2abb4d62..558c2abb4d62 100644
--- a/basegfx/inc/basegfx/range/b3irange.hxx
+++ b/include/basegfx/range/b3irange.hxx
diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx
index bab84c17f89a..bab84c17f89a 100644
--- a/basegfx/inc/basegfx/range/basicbox.hxx
+++ b/include/basegfx/range/basicbox.hxx
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/include/basegfx/range/basicrange.hxx
index 51b5593ae61d..51b5593ae61d 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/include/basegfx/range/basicrange.hxx
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx
index ed7ac931d805..ed7ac931d805 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/include/basegfx/raster/bpixelraster.hxx
diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index ddd4f1e56cb0..ddd4f1e56cb0 100644
--- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
diff --git a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 1bfbe20b1cf0..1bfbe20b1cf0 100644
--- a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
diff --git a/basegfx/inc/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx
index f1d750ae636b..f1d750ae636b 100644
--- a/basegfx/inc/basegfx/tools/b2dclipstate.hxx
+++ b/include/basegfx/tools/b2dclipstate.hxx
diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/include/basegfx/tools/canvastools.hxx
index 819a62e47b28..819a62e47b28 100644
--- a/basegfx/inc/basegfx/tools/canvastools.hxx
+++ b/include/basegfx/tools/canvastools.hxx
diff --git a/basegfx/inc/basegfx/tools/gradienttools.hxx b/include/basegfx/tools/gradienttools.hxx
index aa7479d2c369..aa7479d2c369 100644
--- a/basegfx/inc/basegfx/tools/gradienttools.hxx
+++ b/include/basegfx/tools/gradienttools.hxx
diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/include/basegfx/tools/keystoplerp.hxx
index 8d6d41af63d9..8d6d41af63d9 100644
--- a/basegfx/inc/basegfx/tools/keystoplerp.hxx
+++ b/include/basegfx/tools/keystoplerp.hxx
diff --git a/basegfx/inc/basegfx/tools/lerp.hxx b/include/basegfx/tools/lerp.hxx
index a0c0d714a295..a0c0d714a295 100644
--- a/basegfx/inc/basegfx/tools/lerp.hxx
+++ b/include/basegfx/tools/lerp.hxx
diff --git a/basegfx/inc/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx
index 3d5f77e18e0e..3d5f77e18e0e 100644
--- a/basegfx/inc/basegfx/tools/rectcliptools.hxx
+++ b/include/basegfx/tools/rectcliptools.hxx
diff --git a/basegfx/inc/basegfx/tools/tools.hxx b/include/basegfx/tools/tools.hxx
index c1fa0940ae35..c1fa0940ae35 100644
--- a/basegfx/inc/basegfx/tools/tools.hxx
+++ b/include/basegfx/tools/tools.hxx
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index 72ed9418663a..72ed9418663a 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
diff --git a/basegfx/inc/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx
index c95eb5361f5c..c95eb5361f5c 100644
--- a/basegfx/inc/basegfx/tools/unotools.hxx
+++ b/include/basegfx/tools/unotools.hxx
diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx
index 44d9052a2552..44d9052a2552 100644
--- a/basegfx/inc/basegfx/tools/zoomtools.hxx
+++ b/include/basegfx/tools/zoomtools.hxx
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index 380ba8adf493..380ba8adf493 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index debb4cabe578..debb4cabe578 100644
--- a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx
index 41203a0c58c4..41203a0c58c4 100644
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index 1eb4dd38de09..1eb4dd38de09 100644
--- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/include/basegfx/tuple/b3i64tuple.hxx
index bcc1acaee6b1..bcc1acaee6b1 100644
--- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
+++ b/include/basegfx/tuple/b3i64tuple.hxx
diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx
index 49fb24634ed4..49fb24634ed4 100644
--- a/basegfx/inc/basegfx/tuple/b3ituple.hxx
+++ b/include/basegfx/tuple/b3ituple.hxx
diff --git a/basegfx/inc/basegfx/vector/b2dsize.hxx b/include/basegfx/vector/b2dsize.hxx
index bde343b46685..bde343b46685 100644
--- a/basegfx/inc/basegfx/vector/b2dsize.hxx
+++ b/include/basegfx/vector/b2dsize.hxx
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx
index 99489eb7169c..99489eb7169c 100644
--- a/basegfx/inc/basegfx/vector/b2dvector.hxx
+++ b/include/basegfx/vector/b2dvector.hxx
diff --git a/basegfx/inc/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx
index abbf4cfaf546..abbf4cfaf546 100644
--- a/basegfx/inc/basegfx/vector/b2enums.hxx
+++ b/include/basegfx/vector/b2enums.hxx
diff --git a/basegfx/inc/basegfx/vector/b2isize.hxx b/include/basegfx/vector/b2isize.hxx
index 4a2fe2228661..4a2fe2228661 100644
--- a/basegfx/inc/basegfx/vector/b2isize.hxx
+++ b/include/basegfx/vector/b2isize.hxx
diff --git a/basegfx/inc/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index 63ce2ae28fba..63ce2ae28fba 100644
--- a/basegfx/inc/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx
index 99f23bc7b6d3..99f23bc7b6d3 100644
--- a/basegfx/inc/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
diff --git a/basegfx/inc/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx
index 8248ade15cb0..8248ade15cb0 100644
--- a/basegfx/inc/basegfx/vector/b3ivector.hxx
+++ b/include/basegfx/vector/b3ivector.hxx
diff --git a/basic/inc/basic/basicdllapi.h b/include/basic/basicdllapi.h
index 5c5c4647cd4c..5c5c4647cd4c 100644
--- a/basic/inc/basic/basicdllapi.h
+++ b/include/basic/basicdllapi.h
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx
index 411aeadb8545..411aeadb8545 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
diff --git a/basic/inc/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 12bca4779565..12bca4779565 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
diff --git a/basic/inc/basic/basrdll.hxx b/include/basic/basrdll.hxx
index 20edde65b9cd..20edde65b9cd 100644
--- a/basic/inc/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
diff --git a/basic/inc/basic/global.hxx b/include/basic/global.hxx
index e63029da5785..e63029da5785 100644
--- a/basic/inc/basic/global.hxx
+++ b/include/basic/global.hxx
diff --git a/basic/inc/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 05dd70b4b66d..05dd70b4b66d 100644
--- a/basic/inc/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
diff --git a/basic/inc/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 2bc29cbb08c3..2bc29cbb08c3 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
diff --git a/basic/inc/basic/sberrors.hxx b/include/basic/sberrors.hxx
index f287f3afca88..f287f3afca88 100644
--- a/basic/inc/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
diff --git a/basic/inc/basic/sbmeth.hxx b/include/basic/sbmeth.hxx
index 9d4afbc37a24..9d4afbc37a24 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/include/basic/sbmeth.hxx
diff --git a/basic/inc/basic/sbmod.hxx b/include/basic/sbmod.hxx
index f94e2c9e8a36..f94e2c9e8a36 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
diff --git a/basic/inc/basic/sbobjmod.hxx b/include/basic/sbobjmod.hxx
index 14ca48681688..14ca48681688 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/include/basic/sbobjmod.hxx
diff --git a/basic/inc/basic/sbprop.hxx b/include/basic/sbprop.hxx
index 463fd5d41c73..463fd5d41c73 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/include/basic/sbprop.hxx
diff --git a/basic/inc/basic/sbstar.hxx b/include/basic/sbstar.hxx
index c84b62494169..c84b62494169 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
diff --git a/basic/inc/basic/sbstdobj.hxx b/include/basic/sbstdobj.hxx
index 75a5a6ecb452..75a5a6ecb452 100644
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/include/basic/sbstdobj.hxx
diff --git a/basic/inc/basic/sbuno.hxx b/include/basic/sbuno.hxx
index 55d487a48b75..55d487a48b75 100644
--- a/basic/inc/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
diff --git a/basic/inc/basic/sbx.hxx b/include/basic/sbx.hxx
index d5fba159e510..d5fba159e510 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
diff --git a/basic/inc/basic/sbxbase.hxx b/include/basic/sbxbase.hxx
index 16484ee929d8..16484ee929d8 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/include/basic/sbxbase.hxx
diff --git a/basic/inc/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 4c71d1a5b977..4c71d1a5b977 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
diff --git a/basic/inc/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 781a71b3b430..781a71b3b430 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
diff --git a/basic/inc/basic/sbxfac.hxx b/include/basic/sbxfac.hxx
index 33035cf45c9b..33035cf45c9b 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/include/basic/sbxfac.hxx
diff --git a/basic/inc/basic/sbxform.hxx b/include/basic/sbxform.hxx
index 589f3ec24fd0..589f3ec24fd0 100644
--- a/basic/inc/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
diff --git a/basic/inc/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx
index 227c00cbad88..227c00cbad88 100644
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/include/basic/sbxmeth.hxx
diff --git a/basic/inc/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 2dc4aa735513..2dc4aa735513 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
diff --git a/basic/inc/basic/sbxprop.hxx b/include/basic/sbxprop.hxx
index 89d774d4967f..89d774d4967f 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/include/basic/sbxprop.hxx
diff --git a/basic/inc/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 4d4a8b625bc3..4d4a8b625bc3 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
diff --git a/basic/inc/basic/vbahelper.hxx b/include/basic/vbahelper.hxx
index c18b67b63cd1..c18b67b63cd1 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/include/basic/vbahelper.hxx
diff --git a/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 5c1376b0632b..5c1376b0632b 100644
--- a/canvas/inc/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 2713e0ea11bb..2713e0ea11bb 100644
--- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 8c7e1579f1e2..8c7e1579f1e2 100644
--- a/canvas/inc/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index f7844fd219de..f7844fd219de 100644
--- a/canvas/inc/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
diff --git a/canvas/inc/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 7c1b5508bb4e..7c1b5508bb4e 100644
--- a/canvas/inc/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index 2b2fd2d774d8..2b2fd2d774d8 100644
--- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
diff --git a/canvas/inc/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx
index f12a61472cd4..f12a61472cd4 100644
--- a/canvas/inc/canvas/base/disambiguationhelper.hxx
+++ b/include/canvas/base/disambiguationhelper.hxx
diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 5c3372e3f76a..5c3372e3f76a 100644
--- a/canvas/inc/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 602e18a09eb0..602e18a09eb0 100644
--- a/canvas/inc/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
diff --git a/canvas/inc/canvas/base/sprite.hxx b/include/canvas/base/sprite.hxx
index 4ebafd57f998..4ebafd57f998 100644
--- a/canvas/inc/canvas/base/sprite.hxx
+++ b/include/canvas/base/sprite.hxx
diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index f892bf4170a7..f892bf4170a7 100644
--- a/canvas/inc/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/include/canvas/base/spritesurface.hxx
index 47a0fb24a67d..47a0fb24a67d 100644
--- a/canvas/inc/canvas/base/spritesurface.hxx
+++ b/include/canvas/base/spritesurface.hxx
diff --git a/canvas/inc/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index fd6dadd0a791..fd6dadd0a791 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
diff --git a/canvas/inc/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h
index ad96dec3ea7c..ad96dec3ea7c 100644
--- a/canvas/inc/canvas/canvastoolsdllapi.h
+++ b/include/canvas/canvastoolsdllapi.h
diff --git a/canvas/inc/canvas/debug.hxx b/include/canvas/debug.hxx
index 9fc5ad31711f..9fc5ad31711f 100644
--- a/canvas/inc/canvas/debug.hxx
+++ b/include/canvas/debug.hxx
diff --git a/canvas/inc/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx
index 8248e3408785..8248e3408785 100644
--- a/canvas/inc/canvas/elapsedtime.hxx
+++ b/include/canvas/elapsedtime.hxx
diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index 2e8cb7af45fb..2e8cb7af45fb 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
diff --git a/canvas/inc/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx
index b90d9ef344e5..b90d9ef344e5 100644
--- a/canvas/inc/canvas/propertysethelper.hxx
+++ b/include/canvas/propertysethelper.hxx
diff --git a/canvas/inc/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 295057bd832b..295057bd832b 100644
--- a/canvas/inc/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
diff --git a/canvas/inc/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index f15fed3e72e8..f15fed3e72e8 100644
--- a/canvas/inc/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
diff --git a/canvas/inc/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index 4226a9a6d759..4226a9a6d759 100644
--- a/canvas/inc/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
diff --git a/canvas/inc/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 413320eb85e9..413320eb85e9 100644
--- a/canvas/inc/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
diff --git a/canvas/inc/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index a79faf96a8c8..a79faf96a8c8 100644
--- a/canvas/inc/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
diff --git a/canvas/inc/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index f8db605a38d3..f8db605a38d3 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 98c7795a293e..98c7795a293e 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 7609b4f8f4a6..7609b4f8f4a6 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
diff --git a/canvas/inc/canvas/vclwrapper.hxx b/include/canvas/vclwrapper.hxx
index 330e88cb88ad..330e88cb88ad 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/include/canvas/vclwrapper.hxx
diff --git a/canvas/inc/canvas/verbosetrace.hxx b/include/canvas/verbosetrace.hxx
index d3810c4deaad..d3810c4deaad 100644
--- a/canvas/inc/canvas/verbosetrace.hxx
+++ b/include/canvas/verbosetrace.hxx
diff --git a/canvas/inc/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index 07d72b32ff6c..07d72b32ff6c 100644
--- a/canvas/inc/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx
index 49d1d4b9cea8..49d1d4b9cea8 100644
--- a/codemaker/inc/codemaker/codemaker.hxx
+++ b/include/codemaker/codemaker.hxx
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index 8bff48fc0809..8bff48fc0809 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
diff --git a/codemaker/inc/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx
index 54d9403cda57..54d9403cda57 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/include/codemaker/commonjava.hxx
diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx
index 5392386a3c07..5392386a3c07 100644
--- a/codemaker/inc/codemaker/exceptiontree.hxx
+++ b/include/codemaker/exceptiontree.hxx
diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx
index 3d1a5615b0b1..3d1a5615b0b1 100644
--- a/codemaker/inc/codemaker/generatedtypeset.hxx
+++ b/include/codemaker/generatedtypeset.hxx
diff --git a/codemaker/inc/codemaker/global.hxx b/include/codemaker/global.hxx
index 2c61ce88ec51..2c61ce88ec51 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
diff --git a/codemaker/inc/codemaker/options.hxx b/include/codemaker/options.hxx
index 4a33e280ca69..4a33e280ca69 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx
index fc6aba69ab1d..fc6aba69ab1d 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/include/codemaker/typemanager.hxx
diff --git a/codemaker/inc/codemaker/unotype.hxx b/include/codemaker/unotype.hxx
index b00de6658a99..b00de6658a99 100644
--- a/codemaker/inc/codemaker/unotype.hxx
+++ b/include/codemaker/unotype.hxx
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 2dfe5f3ca256..2dfe5f3ca256 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index ce28803036d5..ce28803036d5 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx
index 497a39fd500d..497a39fd500d 100644
--- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
diff --git a/comphelper/inc/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx
index b23574bbad58..b23574bbad58 100644
--- a/comphelper/inc/comphelper/InlineContainer.hxx
+++ b/include/comphelper/InlineContainer.hxx
diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 266137fdb9b4..266137fdb9b4 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index d2c772e2c5d5..d2c772e2c5d5 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index 3241560b4a94..3241560b4a94 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 56e8375fd215..56e8375fd215 100644
--- a/comphelper/inc/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index d623fa3e5494..d623fa3e5494 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
diff --git a/comphelper/inc/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index 0ced57b31714..0ced57b31714 100644
--- a/comphelper/inc/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
diff --git a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index d0eabc27b807..d0eabc27b807 100644
--- a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index e6c5c10ab20f..e6c5c10ab20f 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
diff --git a/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx
index f0a745baa5a8..f0a745baa5a8 100644
--- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 4849b124cf87..4849b124cf87 100644
--- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index e1bb5dd5f1ef..e1bb5dd5f1ef 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index ea3f505ee7fe..ea3f505ee7fe 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index fbd65d638899..fbd65d638899 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 3407c5a7b8b4..3407c5a7b8b4 100644
--- a/comphelper/inc/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
diff --git a/comphelper/inc/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index fb17b7ca67ec..fb17b7ca67ec 100644
--- a/comphelper/inc/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
diff --git a/comphelper/inc/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx
index e68779854292..e68779854292 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 19c1910dbc8f..19c1910dbc8f 100644
--- a/comphelper/inc/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
diff --git a/comphelper/inc/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index dd10e13c70ab..dd10e13c70ab 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
diff --git a/comphelper/inc/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 42eea8076e47..42eea8076e47 100644
--- a/comphelper/inc/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
diff --git a/comphelper/inc/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx
index d8cf69eeb17b..d8cf69eeb17b 100644
--- a/comphelper/inc/comphelper/broadcasthelper.hxx
+++ b/include/comphelper/broadcasthelper.hxx
diff --git a/comphelper/inc/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 39ab6095802e..39ab6095802e 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
diff --git a/comphelper/inc/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h
index 88d35f61c359..88d35f61c359 100644
--- a/comphelper/inc/comphelper/comphelperdllapi.h
+++ b/include/comphelper/comphelperdllapi.h
diff --git a/comphelper/inc/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index b4035a60f77b..b4035a60f77b 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/include/comphelper/componentcontext.hxx
index d6461502be54..d6461502be54 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/include/comphelper/componentcontext.hxx
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx
index eb1cfbcc24a8..eb1cfbcc24a8 100644
--- a/comphelper/inc/comphelper/componentguard.hxx
+++ b/include/comphelper/componentguard.hxx
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 9ce8a137ede2..9ce8a137ede2 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
diff --git a/comphelper/inc/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 8eecc7facd91..8eecc7facd91 100644
--- a/comphelper/inc/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index b267e4c0c564..b267e4c0c564 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
diff --git a/comphelper/inc/comphelper/container.hxx b/include/comphelper/container.hxx
index d6c5be927873..d6c5be927873 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 725265e493c6..725265e493c6 100644
--- a/comphelper/inc/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 24fd868c0735..24fd868c0735 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 54a32f522ae6..54a32f522ae6 100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx
index 2bc00220995f..2bc00220995f 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/include/comphelper/documentconstants.hxx
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index 48bc39a8cc00..48bc39a8cc00 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index 0347e12ba2c2..0347e12ba2c2 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 9870291b22f5..9870291b22f5 100644
--- a/comphelper/inc/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index a525e7c4ea54..a525e7c4ea54 100644
--- a/comphelper/inc/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
diff --git a/comphelper/inc/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index c1bb01fa3aa4..c1bb01fa3aa4 100644
--- a/comphelper/inc/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx
index 7ecf08a0fc57..7ecf08a0fc57 100644
--- a/comphelper/inc/comphelper/evtmethodhelper.hxx
+++ b/include/comphelper/evtmethodhelper.hxx
diff --git a/comphelper/inc/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 30cbaaefc6c9..30cbaaefc6c9 100644
--- a/comphelper/inc/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
diff --git a/comphelper/inc/comphelper/fileformat.h b/include/comphelper/fileformat.h
index dbd3f32a1f9a..dbd3f32a1f9a 100644
--- a/comphelper/inc/comphelper/fileformat.h
+++ b/include/comphelper/fileformat.h
diff --git a/comphelper/inc/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx
index af1f1ea1e4fd..af1f1ea1e4fd 100644
--- a/comphelper/inc/comphelper/flagguard.hxx
+++ b/include/comphelper/flagguard.hxx
diff --git a/comphelper/inc/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index e46c30a4cad4..e46c30a4cad4 100644
--- a/comphelper/inc/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
diff --git a/comphelper/inc/comphelper/guarding.hxx b/include/comphelper/guarding.hxx
index 3931c0284e31..3931c0284e31 100644
--- a/comphelper/inc/comphelper/guarding.hxx
+++ b/include/comphelper/guarding.hxx
diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
index eb0b13957874..eb0b13957874 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/include/comphelper/ihwrapnofilter.hxx
diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/include/comphelper/implbase_var.hxx
index fee9eb695c08..fee9eb695c08 100644
--- a/comphelper/inc/comphelper/implbase_var.hxx
+++ b/include/comphelper/implbase_var.hxx
diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/include/comphelper/implementationreference.hxx
index 7957d6437ff5..7957d6437ff5 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/include/comphelper/implementationreference.hxx
diff --git a/comphelper/inc/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index bbd925efd3fa..bbd925efd3fa 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 21e2ea74723b..21e2ea74723b 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
diff --git a/comphelper/inc/comphelper/logging.hxx b/include/comphelper/logging.hxx
index b6356384af3d..b6356384af3d 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx
index 2a70094a3f94..2a70094a3f94 100644
--- a/comphelper/inc/comphelper/make_shared_from_uno.hxx
+++ b/include/comphelper/make_shared_from_uno.hxx
diff --git a/comphelper/inc/comphelper/makesequence.hxx b/include/comphelper/makesequence.hxx
index bc35657db9a8..bc35657db9a8 100644
--- a/comphelper/inc/comphelper/makesequence.hxx
+++ b/include/comphelper/makesequence.hxx
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/include/comphelper/mediadescriptor.hxx
index 7c7174644292..7c7174644292 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/include/comphelper/mediadescriptor.hxx
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 6e2b128d5a23..6e2b128d5a23 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
diff --git a/comphelper/inc/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx
index 6ac5aff190fb..6ac5aff190fb 100644
--- a/comphelper/inc/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index 93b53dd14c6c..93b53dd14c6c 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
diff --git a/comphelper/inc/comphelper/newarray.hxx b/include/comphelper/newarray.hxx
index b64095ae8ff4..b64095ae8ff4 100644
--- a/comphelper/inc/comphelper/newarray.hxx
+++ b/include/comphelper/newarray.hxx
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 6a311767658d..6a311767658d 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
diff --git a/comphelper/inc/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index b64fe341da4f..b64fe341da4f 100644
--- a/comphelper/inc/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx
index 5e6d9e1bccc5..5e6d9e1bccc5 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/include/comphelper/officeresourcebundle.hxx
diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index e054d0dbc909..e054d0dbc909 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
diff --git a/comphelper/inc/comphelper/optional.hxx b/include/comphelper/optional.hxx
index 031a30328340..031a30328340 100644
--- a/comphelper/inc/comphelper/optional.hxx
+++ b/include/comphelper/optional.hxx
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index f43297b28b43..f43297b28b43 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
diff --git a/comphelper/inc/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx
index e6833fc49327..e6833fc49327 100644
--- a/comphelper/inc/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
diff --git a/comphelper/inc/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 3a6ca83e36c1..3a6ca83e36c1 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
diff --git a/comphelper/inc/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 840213e88427..840213e88427 100644
--- a/comphelper/inc/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
diff --git a/comphelper/inc/comphelper/property.hxx b/include/comphelper/property.hxx
index 95fe122d51a6..95fe122d51a6 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 92c0026ba845..92c0026ba845 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
diff --git a/comphelper/inc/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 3d208413a722..3d208413a722 100644
--- a/comphelper/inc/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index dacefd8737a6..dacefd8737a6 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index ecc600c37d3c..ecc600c37d3c 100644
--- a/comphelper/inc/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index e0b863e8f2ca..e0b863e8f2ca 100644
--- a/comphelper/inc/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index acd368646628..acd368646628 100644
--- a/comphelper/inc/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 28795e57ce8a..28795e57ce8a 100644
--- a/comphelper/inc/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
diff --git a/comphelper/inc/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index 727f40d96824..727f40d96824 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 2c01a7a3587f..2c01a7a3587f 100644
--- a/comphelper/inc/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx
index dabf9f473e92..dabf9f473e92 100644
--- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
+++ b/include/comphelper/scoped_disposing_ptr.hxx
diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 5bc2aafaa781..5bc2aafaa781 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
diff --git a/comphelper/inc/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 02c4997a2cb6..02c4997a2cb6 100644
--- a/comphelper/inc/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
diff --git a/comphelper/inc/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 4f9c9380bfa1..4f9c9380bfa1 100644
--- a/comphelper/inc/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
diff --git a/comphelper/inc/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index ad1e8943b952..ad1e8943b952 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 0c8353776931..0c8353776931 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx
index 305eba9245ff..305eba9245ff 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/include/comphelper/sequenceasvector.hxx
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index be3b275cf215..be3b275cf215 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
diff --git a/comphelper/inc/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index a861e88db2d7..a861e88db2d7 100644
--- a/comphelper/inc/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index 25169d1043a0..25169d1043a0 100644
--- a/comphelper/inc/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
diff --git a/comphelper/inc/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 8013e7f404aa..8013e7f404aa 100644
--- a/comphelper/inc/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index c6d62e8da9e2..c6d62e8da9e2 100644
--- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index cef5afdff3f2..cef5afdff3f2 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
diff --git a/comphelper/inc/comphelper/stlunosequence.hxx b/include/comphelper/stlunosequence.hxx
index c7b776f78d6e..c7b776f78d6e 100644
--- a/comphelper/inc/comphelper/stlunosequence.hxx
+++ b/include/comphelper/stlunosequence.hxx
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 093038e6e5ed..093038e6e5ed 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
diff --git a/comphelper/inc/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 40ea508f888b..40ea508f888b 100644
--- a/comphelper/inc/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
diff --git a/comphelper/inc/comphelper/string.hxx b/include/comphelper/string.hxx
index 85b0816b895e..85b0816b895e 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx
index efeffea6b4eb..efeffea6b4eb 100644
--- a/comphelper/inc/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
diff --git a/comphelper/inc/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index ef1a9486a6bf..ef1a9486a6bf 100644
--- a/comphelper/inc/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
diff --git a/comphelper/inc/comphelper/types.hxx b/include/comphelper/types.hxx
index 66c6a9e0bcfb..66c6a9e0bcfb 100644
--- a/comphelper/inc/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
diff --git a/comphelper/inc/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 1b83c73f4f25..1b83c73f4f25 100644
--- a/comphelper/inc/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index c4885f3883d9..c4885f3883d9 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
diff --git a/comphelper/inc/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 126078adbf59..126078adbf59 100644
--- a/comphelper/inc/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
diff --git a/comphelper/inc/comphelper/weakbag.hxx b/include/comphelper/weakbag.hxx
index b654baa2bda4..b654baa2bda4 100644
--- a/comphelper/inc/comphelper/weakbag.hxx
+++ b/include/comphelper/weakbag.hxx
diff --git a/comphelper/inc/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 33defc8a36c9..33defc8a36c9 100644
--- a/comphelper/inc/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
diff --git a/comphelper/inc/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx
index d8287dd4a89b..d8287dd4a89b 100644
--- a/comphelper/inc/comphelper/xmltools.hxx
+++ b/include/comphelper/xmltools.hxx
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx
index 6788a17b10df..6788a17b10df 100644
--- a/connectivity/inc/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.hxx
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index c13b97dc7050..c13b97dc7050 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx
index 84a828800a9c..84a828800a9c 100644
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/include/connectivity/ConnectionWrapper.hxx
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index 69c28cacbb02..69c28cacbb02 100644
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
diff --git a/connectivity/inc/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 34e73612bfa1..34e73612bfa1 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 0352ed8ec39f..0352ed8ec39f 100644
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
diff --git a/connectivity/inc/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx
index 2a55aa35c374..2a55aa35c374 100644
--- a/connectivity/inc/connectivity/OSubComponent.hxx
+++ b/include/connectivity/OSubComponent.hxx
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index a54cb809ca29..a54cb809ca29 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index 0c9c92ee4468..0c9c92ee4468 100644
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx
index 8302dae6b5c5..8302dae6b5c5 100644
--- a/connectivity/inc/connectivity/SQLStatementHelper.hxx
+++ b/include/connectivity/SQLStatementHelper.hxx
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx
index 8751a656d2c0..8751a656d2c0 100644
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/include/connectivity/StdTypeDefs.hxx
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index 5fe1dd0eb845..5fe1dd0eb845 100644
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index b8502af9c5ec..b8502af9c5ec 100644
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 31b0ecfe3ca5..31b0ecfe3ca5 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx
index c558c709c8e8..c558c709c8e8 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/include/connectivity/TIndexes.hxx
diff --git a/connectivity/inc/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index 9b24e41c3126..9b24e41c3126 100644
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index 6dbb041805b4..6dbb041805b4 100644
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index 817b24da3a42..817b24da3a42 100644
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index aeb58cb4dd0c..aeb58cb4dd0c 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 1eec5ac50f98..1eec5ac50f98 100644
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index 712c44abddb4..712c44abddb4 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 9536c799ec81..9536c799ec81 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index a84450b607d8..a84450b607d8 100644
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 565854ba7ed8..565854ba7ed8 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 9706af6ccb1c..9706af6ccb1c 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/include/connectivity/dbtoolsdllapi.hxx
index 51210a633092..51210a633092 100644
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/include/connectivity/dbtoolsdllapi.hxx
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index c489a91e5033..c489a91e5033 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.hxx
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index fe5c4dbfff52..fe5c4dbfff52 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
diff --git a/connectivity/inc/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 9bdbe0e5c3fb..9bdbe0e5c3fb 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 69347e9c4e6d..69347e9c4e6d 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx
index 629419c9719d..629419c9719d 100644
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx
index 629b2b3137b5..629b2b3137b5 100644
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/include/connectivity/sdbcx/IRefreshable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index 14840400b385..14840400b385 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index e30075f009e9..e30075f009e9 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 42cddc51c041..42cddc51c041 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index aa04b5229ac9..aa04b5229ac9 100644
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 6e4ba2355d62..6e4ba2355d62 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 3e50ddf9459c..3e50ddf9459c 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index a4de9e6bf5bd..a4de9e6bf5bd 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 24d85dfb2614..24d85dfb2614 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index b22ea3247941..b22ea3247941 100644
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 0be41a9cd22f..0be41a9cd22f 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx
index 08019f9174da..08019f9174da 100644
--- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
+++ b/include/connectivity/sdbcx/VTypeDef.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 01bafc0d177c..01bafc0d177c 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 6134ddc4bb69..6134ddc4bb69 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index ccad18a88d0f..ccad18a88d0f 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index ee967dd7d7a3..ee967dd7d7a3 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index f988f78e7e14..f988f78e7e14 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index 892d3ecb8db5..892d3ecb8db5 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx
index fb896d1a8af8..fb896d1a8af8 100644
--- a/connectivity/inc/connectivity/standardsqlstate.hxx
+++ b/include/connectivity/standardsqlstate.hxx
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index 56b10ebd0d11..56b10ebd0d11 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx
index 352c98d7a8c4..352c98d7a8c4 100644
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/include/connectivity/virtualdbtools.hxx
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx
index 5a013f9a5145..5a013f9a5145 100644
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/include/connectivity/warningscontainer.hxx
diff --git a/cosv/inc/cosv/bstream.hxx b/include/cosv/bstream.hxx
index 2d943bc02ce6..2d943bc02ce6 100644
--- a/cosv/inc/cosv/bstream.hxx
+++ b/include/cosv/bstream.hxx
diff --git a/cosv/inc/cosv/comdline.hxx b/include/cosv/comdline.hxx
index 80ebc763b9d9..80ebc763b9d9 100644
--- a/cosv/inc/cosv/comdline.hxx
+++ b/include/cosv/comdline.hxx
diff --git a/cosv/inc/cosv/comfunc.hxx b/include/cosv/comfunc.hxx
index a294d81f2aae..a294d81f2aae 100644
--- a/cosv/inc/cosv/comfunc.hxx
+++ b/include/cosv/comfunc.hxx
diff --git a/cosv/inc/cosv/csv_env.hxx b/include/cosv/csv_env.hxx
index f49ed54ea464..f49ed54ea464 100644
--- a/cosv/inc/cosv/csv_env.hxx
+++ b/include/cosv/csv_env.hxx
diff --git a/cosv/inc/cosv/csv_ostream.hxx b/include/cosv/csv_ostream.hxx
index 911fcb8c799e..911fcb8c799e 100644
--- a/cosv/inc/cosv/csv_ostream.hxx
+++ b/include/cosv/csv_ostream.hxx
diff --git a/cosv/inc/cosv/csv_precomp.h b/include/cosv/csv_precomp.h
index 78f1378cda61..78f1378cda61 100644
--- a/cosv/inc/cosv/csv_precomp.h
+++ b/include/cosv/csv_precomp.h
diff --git a/cosv/inc/cosv/dirchain.hxx b/include/cosv/dirchain.hxx
index 980937212690..980937212690 100644
--- a/cosv/inc/cosv/dirchain.hxx
+++ b/include/cosv/dirchain.hxx
diff --git a/cosv/inc/cosv/file.hxx b/include/cosv/file.hxx
index 86c880e73184..86c880e73184 100644
--- a/cosv/inc/cosv/file.hxx
+++ b/include/cosv/file.hxx
diff --git a/cosv/inc/cosv/openclose.hxx b/include/cosv/openclose.hxx
index c65ce5b753e2..c65ce5b753e2 100644
--- a/cosv/inc/cosv/openclose.hxx
+++ b/include/cosv/openclose.hxx
diff --git a/cosv/inc/cosv/persist.hxx b/include/cosv/persist.hxx
index 13ac4b5dab68..13ac4b5dab68 100644
--- a/cosv/inc/cosv/persist.hxx
+++ b/include/cosv/persist.hxx
diff --git a/cosv/inc/cosv/ploc.hxx b/include/cosv/ploc.hxx
index 81f952de5223..81f952de5223 100644
--- a/cosv/inc/cosv/ploc.hxx
+++ b/include/cosv/ploc.hxx
diff --git a/cosv/inc/cosv/ploc_dir.hxx b/include/cosv/ploc_dir.hxx
index e6c8f04538f2..e6c8f04538f2 100644
--- a/cosv/inc/cosv/ploc_dir.hxx
+++ b/include/cosv/ploc_dir.hxx
diff --git a/cosv/inc/cosv/plocroot.hxx b/include/cosv/plocroot.hxx
index b079f04b1b9f..b079f04b1b9f 100644
--- a/cosv/inc/cosv/plocroot.hxx
+++ b/include/cosv/plocroot.hxx
diff --git a/cosv/inc/cosv/std_outp.hxx b/include/cosv/std_outp.hxx
index 08fe179e16ab..08fe179e16ab 100644
--- a/cosv/inc/cosv/std_outp.hxx
+++ b/include/cosv/std_outp.hxx
diff --git a/cosv/inc/cosv/str_types.hxx b/include/cosv/str_types.hxx
index ecf9c997c271..ecf9c997c271 100644
--- a/cosv/inc/cosv/str_types.hxx
+++ b/include/cosv/str_types.hxx
diff --git a/cosv/inc/cosv/streamstr.hxx b/include/cosv/streamstr.hxx
index ec13f8ec63c6..ec13f8ec63c6 100644
--- a/cosv/inc/cosv/streamstr.hxx
+++ b/include/cosv/streamstr.hxx
diff --git a/cosv/inc/cosv/string.hxx b/include/cosv/string.hxx
index 756aa9a1492c..756aa9a1492c 100644
--- a/cosv/inc/cosv/string.hxx
+++ b/include/cosv/string.hxx
diff --git a/cosv/inc/cosv/stringdata.hxx b/include/cosv/stringdata.hxx
index 0187cb4265a9..0187cb4265a9 100644
--- a/cosv/inc/cosv/stringdata.hxx
+++ b/include/cosv/stringdata.hxx
diff --git a/cosv/inc/cosv/tpl/dyn.hxx b/include/cosv/tpl/dyn.hxx
index 46095c6c3b7c..46095c6c3b7c 100644
--- a/cosv/inc/cosv/tpl/dyn.hxx
+++ b/include/cosv/tpl/dyn.hxx
diff --git a/cosv/inc/cosv/tpl/processor.hxx b/include/cosv/tpl/processor.hxx
index a685acd5bed6..a685acd5bed6 100644
--- a/cosv/inc/cosv/tpl/processor.hxx
+++ b/include/cosv/tpl/processor.hxx
diff --git a/cosv/inc/cosv/tpl/swelist.hxx b/include/cosv/tpl/swelist.hxx
index 5c64efc29cc2..5c64efc29cc2 100644
--- a/cosv/inc/cosv/tpl/swelist.hxx
+++ b/include/cosv/tpl/swelist.hxx
diff --git a/cosv/inc/cosv/tpl/tpltools.hxx b/include/cosv/tpl/tpltools.hxx
index 487a74cf8237..487a74cf8237 100644
--- a/cosv/inc/cosv/tpl/tpltools.hxx
+++ b/include/cosv/tpl/tpltools.hxx
diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/include/cosv/tpl/vvector.hxx
index dec58642bf23..dec58642bf23 100644
--- a/cosv/inc/cosv/tpl/vvector.hxx
+++ b/include/cosv/tpl/vvector.hxx
diff --git a/cosv/inc/cosv/x.hxx b/include/cosv/x.hxx
index 755436317a39..755436317a39 100644
--- a/cosv/inc/cosv/x.hxx
+++ b/include/cosv/x.hxx
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx
index 83acb38c448f..83acb38c448f 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/include/cppcanvas/basegfxfactory.hxx
diff --git a/cppcanvas/inc/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 5e542e7220aa..5e542e7220aa 100644
--- a/cppcanvas/inc/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
diff --git a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx
index 620182a14e45..620182a14e45 100644
--- a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
+++ b/include/cppcanvas/bitmapcanvas.hxx
diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index 0a77e7129a43..0a77e7129a43 100644
--- a/cppcanvas/inc/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index e496df6aeb33..e496df6aeb33 100644
--- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index 6d7dc957286a..6d7dc957286a 100644
--- a/cppcanvas/inc/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
diff --git a/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h b/include/cppcanvas/cppcanvasdllapi.h
index be641aad8b2b..be641aad8b2b 100644
--- a/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
+++ b/include/cppcanvas/cppcanvasdllapi.h
diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx
index 70004e7e5900..70004e7e5900 100644
--- a/cppcanvas/inc/cppcanvas/customsprite.hxx
+++ b/include/cppcanvas/customsprite.hxx
diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/include/cppcanvas/font.hxx
index 967903eaa8e7..967903eaa8e7 100644
--- a/cppcanvas/inc/cppcanvas/font.hxx
+++ b/include/cppcanvas/font.hxx
diff --git a/cppcanvas/inc/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index ccfbb95d3def..ccfbb95d3def 100644
--- a/cppcanvas/inc/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx
index e260e9400248..e260e9400248 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/include/cppcanvas/renderer.hxx
diff --git a/cppcanvas/inc/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 0e87ff9b9dd1..0e87ff9b9dd1 100644
--- a/cppcanvas/inc/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index 6a606b331edf..6a606b331edf 100644
--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
diff --git a/cppcanvas/inc/cppcanvas/text.hxx b/include/cppcanvas/text.hxx
index 4ca53532c282..4ca53532c282 100644
--- a/cppcanvas/inc/cppcanvas/text.hxx
+++ b/include/cppcanvas/text.hxx
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index b5d2f9612be9..b5d2f9612be9 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/include/drawinglayer/XShapeDumper.hxx
index a1cd59948362..a1cd59948362 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/include/drawinglayer/XShapeDumper.hxx
diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx
index 08ee95090f6c..08ee95090f6c 100644
--- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx
+++ b/include/drawinglayer/animation/animationtiming.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx
index 851dc5ed0697..851dc5ed0697 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx
+++ b/include/drawinglayer/attribute/fillbitmapattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx
index e791193651a0..e791193651a0 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx
index 7e6244be090b..7e6244be090b 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx
index b49ab83b300e..b49ab83b300e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx
index 58eb987714e3..58eb987714e3 100644
--- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/include/drawinglayer/attribute/lineattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx
index e02d3565aaf7..e02d3565aaf7 100644
--- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx
+++ b/include/drawinglayer/attribute/linestartendattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx
index 9c4d34dce155..9c4d34dce155 100644
--- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx
+++ b/include/drawinglayer/attribute/materialattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx
index abd46bf273fe..abd46bf273fe 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx
index 7fd3d38c224e..7fd3d38c224e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/include/drawinglayer/attribute/sdrfillbitmapattribute.hxx
index 78417f3577c9..78417f3577c9 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillbitmapattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
index f9e35798cd3e..f9e35798cd3e 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
index 0c3bb96b9f70..0c3bb96b9f70 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx
index bedbd9f29bb9..bedbd9f29bb9 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlineattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
index 19c1a5147db0..19c1a5147db0 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
index 860093a67666..860093a67666 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
index 61d4d8a67378..61d4d8a67378 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx
index ee1f36292505..ee1f36292505 100644
--- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx
index 6d4cea978482..6d4cea978482 100644
--- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx
+++ b/include/drawinglayer/attribute/strokeattribute.hxx
diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/include/drawinglayer/drawinglayerdllapi.h
index 0b3983504919..0b3983504919 100644
--- a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
+++ b/include/drawinglayer/drawinglayerdllapi.h
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx
index f8e0d6699448..f8e0d6699448 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx
+++ b/include/drawinglayer/geometry/viewinformation2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx
index 86c9a2c16296..86c9a2c16296 100644
--- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx
+++ b/include/drawinglayer/geometry/viewinformation3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 59ee3225dc78..59ee3225dc78 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 3986aba3566b..3986aba3566b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 157c13bb33a8..157c13bb33a8 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index fa262bd9fe95..fa262bd9fe95 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index d9ed473851f4..d9ed473851f4 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
index 6db292fd6859..6db292fd6859 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
index 789b7aa38471..789b7aa38471 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 25d044b3231f..25d044b3231f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
index 9b8528057c14..9b8528057c14 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
index 2c10292b1c59..2c10292b1c59 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index cb8ff0efd0ff..cb8ff0efd0ff 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index d7389bea2bc3..d7389bea2bc3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index 577554481d6e..577554481d6e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
index 0c82458840ad..0c82458840ad 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 0f6c33ae8f95..0f6c33ae8f95 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index b0c27ba89107..b0c27ba89107 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
index 75bb6fc99341..75bb6fc99341 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
index 3db300ff4da4..3db300ff4da4 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
index 7dab4a628638..7dab4a628638 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
index c9addb8f3810..c9addb8f3810 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
index 35c8de40bc4d..35c8de40bc4d 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
index dfff3d9034ba..dfff3d9034ba 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
index b1bca354e60e..b1bca354e60e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
index af5fcd9177d1..af5fcd9177d1 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
index df75569ecb64..df75569ecb64 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx
index a8e8cf883991..a8e8cf883991 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index 7584cfad27b7..7584cfad27b7 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index ec5452773751..ec5452773751 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index 5acdf2157f10..5acdf2157f10 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
index 7787d6f6ba28..7787d6f6ba28 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 8acb5956f60f..8acb5956f60f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 09e5b29039b3..09e5b29039b3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index f53d4cdf5759..f53d4cdf5759 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx
index 6ef63f1e916b..6ef63f1e916b 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
index d865ba15161a..d865ba15161a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
index 5ac29383ff76..5ac29383ff76 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
+++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 956d1a3e2d76..956d1a3e2d76 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index bc2396e5ab23..bc2396e5ab23 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
index 0e7dab93ff14..0e7dab93ff14 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index 4a3996353a93..4a3996353a93 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx
+++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 506510958848..506510958848 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 01fff05473d5..01fff05473d5 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
index 36531e6fce16..36531e6fce16 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index e9fb01f094ff..e9fb01f094ff 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index a0338a371aad..a0338a371aad 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
index 6bcca85a8bc2..6bcca85a8bc2 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx
index 5a12e2bc678f..5a12e2bc678f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
index 216fe740933a..216fe740933a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
index e58c530fa71f..e58c530fa71f 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
index 1c742da909d3..1c742da909d3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
index e30de32107f6..e30de32107f6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
index 0e370b74dab0..0e370b74dab0 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
index cafd40f40aa3..cafd40f40aa3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 974c47d9e485..974c47d9e485 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
index 3be15ad5e8bb..3be15ad5e8bb 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
+++ b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx
index d8d3f5b77446..d8d3f5b77446 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
index 981027a1615b..981027a1615b 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
index 7fe7359b4824..7fe7359b4824 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
index 0e5fe4329e12..0e5fe4329e12 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx
index 62fb60265732..62fb60265732 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
index 56f7dc4b4d4a..56f7dc4b4d4a 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
index 7f916afe978c..7f916afe978c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
index 513d120c5343..513d120c5343 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
index ffe0e2cea676..ffe0e2cea676 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index d741b4c1b223..d741b4c1b223 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index 055e7e71dd4c..055e7e71dd4c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index 7632e8e5985c..7632e8e5985c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
index 2d9976224e6b..2d9976224e6b 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx
index 6563f5172f67..6563f5172f67 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
index 48e7ee42ceb2..48e7ee42ceb2 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
index 76be7e7742f4..76be7e7742f4 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx
index 1ce8e9bcd57c..1ce8e9bcd57c 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx
index 85a88a330d77..85a88a330d77 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index 62a0f874a9ae..62a0f874a9ae 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx
index 5dea3b450c19..5dea3b450c19 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
+++ b/include/drawinglayer/processor2d/canvasprocessor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx
index af390a8cd7b7..af390a8cd7b7 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
+++ b/include/drawinglayer/processor2d/contourextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index fc2ab3252558..fc2ab3252558 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
index 4905f4062c5f..4905f4062c5f 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
+++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
index 42f4fb3970de..42f4fb3970de 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx
+++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
index cd149db71e6d..cd149db71e6d 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/processorfromoutputdevice.hxx
+++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
index 239e624ccced..239e624ccced 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx
+++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index fa85105939c8..fa85105939c8 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
index c3003f096467..c3003f096467 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/include/drawinglayer/processor2d/vclprocessor2d.hxx
index 32dafbc42b0a..32dafbc42b0a 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/vclprocessor2d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx
index 834779982ba5..834779982ba5 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx
index 2b4714ca3054..2b4714ca3054 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
index 010fba3b1f1d..010fba3b1f1d 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx
index d85e6843f54d..d85e6843f54d 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx
+++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx
index 183d61271c83..183d61271c83 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx
diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 8570809b465d..8570809b465d 100644
--- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx
index 5d1751d70889..5d1751d70889 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture.hxx
+++ b/include/drawinglayer/texture/texture.hxx
diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx
index 713cea76c928..713cea76c928 100644
--- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx
+++ b/include/drawinglayer/texture/texture3d.hxx
diff --git a/drawinglayer/inc/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx
index 5bc9ddbb18e4..5bc9ddbb18e4 100644
--- a/drawinglayer/inc/drawinglayer/tools/converters.hxx
+++ b/include/drawinglayer/tools/converters.hxx
diff --git a/editeng/inc/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx
index ea292e0e439c..ea292e0e439c 100644
--- a/editeng/inc/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx
index 574582a68ae1..574582a68ae1 100644
--- a/editeng/inc/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 5f245d0786f5..5f245d0786f5 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 9d852962e9e6..9d852962e9e6 100644
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index 90bc3d8a111d..90bc3d8a111d 100644
--- a/editeng/inc/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
diff --git a/editeng/inc/editeng/AccessibleSelectionBase.hxx b/include/editeng/AccessibleSelectionBase.hxx
index 7935d5dd1ae2..7935d5dd1ae2 100644
--- a/editeng/inc/editeng/AccessibleSelectionBase.hxx
+++ b/include/editeng/AccessibleSelectionBase.hxx
diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index 8ca75d7a5766..8ca75d7a5766 100644
--- a/editeng/inc/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
diff --git a/editeng/inc/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx
index cae879f95a1a..cae879f95a1a 100644
--- a/editeng/inc/editeng/AccessibleStringWrap.hxx
+++ b/include/editeng/AccessibleStringWrap.hxx
diff --git a/editeng/inc/editeng/LatinLookupTree.hxx b/include/editeng/LatinLookupTree.hxx
index 9407780f5b80..9407780f5b80 100644
--- a/editeng/inc/editeng/LatinLookupTree.hxx
+++ b/include/editeng/LatinLookupTree.hxx
diff --git a/editeng/inc/editeng/LatinTreeNode.hxx b/include/editeng/LatinTreeNode.hxx
index 5e406858697c..5e406858697c 100644
--- a/editeng/inc/editeng/LatinTreeNode.hxx
+++ b/include/editeng/LatinTreeNode.hxx
diff --git a/editeng/inc/editeng/LookupTree.hxx b/include/editeng/LookupTree.hxx
index 95abcf25d6f8..95abcf25d6f8 100644
--- a/editeng/inc/editeng/LookupTree.hxx
+++ b/include/editeng/LookupTree.hxx
diff --git a/editeng/inc/editeng/Node.hxx b/include/editeng/Node.hxx
index 3159e48a99b7..3159e48a99b7 100644
--- a/editeng/inc/editeng/Node.hxx
+++ b/include/editeng/Node.hxx
diff --git a/editeng/inc/editeng/SpellPortions.hxx b/include/editeng/SpellPortions.hxx
index f96a14b0f557..f96a14b0f557 100644
--- a/editeng/inc/editeng/SpellPortions.hxx
+++ b/include/editeng/SpellPortions.hxx
diff --git a/editeng/inc/editeng/TreeHead.hxx b/include/editeng/TreeHead.hxx
index 12c8b33c8d66..12c8b33c8d66 100644
--- a/editeng/inc/editeng/TreeHead.hxx
+++ b/include/editeng/TreeHead.hxx
diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx
index 9fea61b9084c..9fea61b9084c 100644
--- a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
+++ b/include/editeng/UnoForbiddenCharsTable.hxx
diff --git a/editeng/inc/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 3c3321ccfc2d..3c3321ccfc2d 100644
--- a/editeng/inc/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
diff --git a/editeng/inc/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index e19907cd1737..e19907cd1737 100644
--- a/editeng/inc/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
diff --git a/editeng/inc/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index 6d849dc39d23..6d849dc39d23 100644
--- a/editeng/inc/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
diff --git a/editeng/inc/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 0d495e6e100e..0d495e6e100e 100644
--- a/editeng/inc/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
diff --git a/editeng/inc/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 067e216aaa9a..067e216aaa9a 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
diff --git a/editeng/inc/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 256663c961e9..256663c961e9 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
diff --git a/editeng/inc/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 069a3b7f636a..069a3b7f636a 100644
--- a/editeng/inc/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
diff --git a/editeng/inc/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 345cf3ff7639..345cf3ff7639 100644
--- a/editeng/inc/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx
index 651bdc240ef1..651bdc240ef1 100644
--- a/editeng/inc/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx
index 5bc6c589d02d..5bc6c589d02d 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
diff --git a/editeng/inc/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 7845ab69ccd8..7845ab69ccd8 100644
--- a/editeng/inc/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
diff --git a/editeng/inc/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx
index 7d9b38761852..7d9b38761852 100644
--- a/editeng/inc/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
diff --git a/editeng/inc/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
index 6fc197fb1394..6fc197fb1394 100644
--- a/editeng/inc/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
diff --git a/editeng/inc/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index f7326758befc..f7326758befc 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
diff --git a/editeng/inc/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 954fcd3b6ba0..954fcd3b6ba0 100644
--- a/editeng/inc/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
diff --git a/editeng/inc/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 316f21fc774e..316f21fc774e 100644
--- a/editeng/inc/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
diff --git a/editeng/inc/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 6628609e060e..6628609e060e 100644
--- a/editeng/inc/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
diff --git a/editeng/inc/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 9b6d9e7005c3..9b6d9e7005c3 100644
--- a/editeng/inc/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
diff --git a/editeng/inc/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 83ba64342443..83ba64342443 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
diff --git a/editeng/inc/editeng/editengdllapi.h b/include/editeng/editengdllapi.h
index ce764e81fece..ce764e81fece 100644
--- a/editeng/inc/editeng/editengdllapi.h
+++ b/include/editeng/editengdllapi.h
diff --git a/editeng/inc/editeng/editerr.hxx b/include/editeng/editerr.hxx
index d262057763e7..d262057763e7 100644
--- a/editeng/inc/editeng/editerr.hxx
+++ b/include/editeng/editerr.hxx
diff --git a/editeng/inc/editeng/editids.hrc b/include/editeng/editids.hrc
index 7dbaae890a51..7dbaae890a51 100644
--- a/editeng/inc/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
diff --git a/editeng/inc/editeng/editobj.hxx b/include/editeng/editobj.hxx
index 16bc0be626e5..16bc0be626e5 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
diff --git a/editeng/inc/editeng/editrids.hrc b/include/editeng/editrids.hrc
index 04ec3b6eccc7..04ec3b6eccc7 100644
--- a/editeng/inc/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
diff --git a/editeng/inc/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 175267938c91..175267938c91 100644
--- a/editeng/inc/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
diff --git a/editeng/inc/editeng/editund2.hxx b/include/editeng/editund2.hxx
index 2312aee93c79..2312aee93c79 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/include/editeng/editund2.hxx
diff --git a/editeng/inc/editeng/editview.hxx b/include/editeng/editview.hxx
index a2f5ce8a3d65..a2f5ce8a3d65 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
diff --git a/editeng/inc/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 7c998dfa637b..7c998dfa637b 100644
--- a/editeng/inc/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
diff --git a/editeng/inc/editeng/eedata.hxx b/include/editeng/eedata.hxx
index 1332c56f4a54..1332c56f4a54 100644
--- a/editeng/inc/editeng/eedata.hxx
+++ b/include/editeng/eedata.hxx
diff --git a/editeng/inc/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index 04ce68ce1ef5..04ce68ce1ef5 100644
--- a/editeng/inc/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
diff --git a/editeng/inc/editeng/eeitemid.hxx b/include/editeng/eeitemid.hxx
index 8230387048ff..8230387048ff 100644
--- a/editeng/inc/editeng/eeitemid.hxx
+++ b/include/editeng/eeitemid.hxx
diff --git a/editeng/inc/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 2d6ba34976fa..2d6ba34976fa 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
diff --git a/editeng/inc/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx
index 1be4b0a7ce7d..1be4b0a7ce7d 100644
--- a/editeng/inc/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
diff --git a/editeng/inc/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index 53fcb736f971..53fcb736f971 100644
--- a/editeng/inc/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 60f417428827..60f417428827 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
diff --git a/editeng/inc/editeng/fieldupdater.hxx b/include/editeng/fieldupdater.hxx
index 8ddab5ecf91e..8ddab5ecf91e 100644
--- a/editeng/inc/editeng/fieldupdater.hxx
+++ b/include/editeng/fieldupdater.hxx
diff --git a/editeng/inc/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 37f42a37c217..37f42a37c217 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
diff --git a/editeng/inc/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index f298732e25e4..f298732e25e4 100644
--- a/editeng/inc/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
diff --git a/editeng/inc/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index e9d14755906e..e9d14755906e 100644
--- a/editeng/inc/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx
index 14556fd0ceda..14556fd0ceda 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/include/editeng/forbiddencharacterstable.hxx
diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx
index 2d15a3d00bf3..2d15a3d00bf3 100644
--- a/editeng/inc/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
diff --git a/editeng/inc/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 229e1d05f55f..229e1d05f55f 100644
--- a/editeng/inc/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
diff --git a/editeng/inc/editeng/frmdir.hxx b/include/editeng/frmdir.hxx
index f687c32c5610..f687c32c5610 100644
--- a/editeng/inc/editeng/frmdir.hxx
+++ b/include/editeng/frmdir.hxx
diff --git a/editeng/inc/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 6ea04dc66f09..6ea04dc66f09 100644
--- a/editeng/inc/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index 73f897ffc06d..73f897ffc06d 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
diff --git a/editeng/inc/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 014dc3e229a9..014dc3e229a9 100644
--- a/editeng/inc/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index 4454faab0b76..4454faab0b76 100644
--- a/editeng/inc/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
diff --git a/editeng/inc/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 3f0682096772..3f0682096772 100644
--- a/editeng/inc/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
diff --git a/editeng/inc/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 422cb3b9e22e..422cb3b9e22e 100644
--- a/editeng/inc/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
diff --git a/editeng/inc/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index cfbdcff00a65..cfbdcff00a65 100644
--- a/editeng/inc/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
diff --git a/editeng/inc/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 57e8fe022af4..57e8fe022af4 100644
--- a/editeng/inc/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
diff --git a/editeng/inc/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index 1b5f937afc01..1b5f937afc01 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
diff --git a/editeng/inc/editeng/langitem.hxx b/include/editeng/langitem.hxx
index e1231cded21c..e1231cded21c 100644
--- a/editeng/inc/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
diff --git a/editeng/inc/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx
index 5b97c52d6c6d..5b97c52d6c6d 100644
--- a/editeng/inc/editeng/lcolitem.hxx
+++ b/include/editeng/lcolitem.hxx
diff --git a/editeng/inc/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index 07ad4da38bc5..07ad4da38bc5 100644
--- a/editeng/inc/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
diff --git a/editeng/inc/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index a7e95ccb6e63..a7e95ccb6e63 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
diff --git a/editeng/inc/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index de0a163e34e6..de0a163e34e6 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
diff --git a/editeng/inc/editeng/macros.hxx b/include/editeng/macros.hxx
index c667cfd6e8b8..c667cfd6e8b8 100644
--- a/editeng/inc/editeng/macros.hxx
+++ b/include/editeng/macros.hxx
diff --git a/editeng/inc/editeng/measfld.hxx b/include/editeng/measfld.hxx
index 040560397dd0..040560397dd0 100644
--- a/editeng/inc/editeng/measfld.hxx
+++ b/include/editeng/measfld.hxx
diff --git a/editeng/inc/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1dbe7ba9da5f..1dbe7ba9da5f 100644
--- a/editeng/inc/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
diff --git a/editeng/inc/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx
index 14b36347b74d..14b36347b74d 100644
--- a/editeng/inc/editeng/mutxhelp.hxx
+++ b/include/editeng/mutxhelp.hxx
diff --git a/editeng/inc/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index 51942c318bbd..51942c318bbd 100644
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx
index 209b0539ba07..209b0539ba07 100644
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/include/editeng/nlbkitem.hxx
diff --git a/editeng/inc/editeng/numdef.hxx b/include/editeng/numdef.hxx
index 28f94d2d3ae5..28f94d2d3ae5 100644
--- a/editeng/inc/editeng/numdef.hxx
+++ b/include/editeng/numdef.hxx
diff --git a/editeng/inc/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 9f88e79de0ec..9f88e79de0ec 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
diff --git a/editeng/inc/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index 7780c4237c5d..7780c4237c5d 100644
--- a/editeng/inc/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
diff --git a/editeng/inc/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 34970ebbc42c..34970ebbc42c 100644
--- a/editeng/inc/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
diff --git a/editeng/inc/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index 60ef8520c677..60ef8520c677 100644
--- a/editeng/inc/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
diff --git a/editeng/inc/editeng/outliner.hxx b/include/editeng/outliner.hxx
index e2f208e9b824..e2f208e9b824 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
diff --git a/editeng/inc/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 73eb9b5b96d5..73eb9b5b96d5 100644
--- a/editeng/inc/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
diff --git a/editeng/inc/editeng/paperinf.hxx b/include/editeng/paperinf.hxx
index 2c53ca554122..2c53ca554122 100644
--- a/editeng/inc/editeng/paperinf.hxx
+++ b/include/editeng/paperinf.hxx
diff --git a/editeng/inc/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx
index 81d12bb00a2f..81d12bb00a2f 100644
--- a/editeng/inc/editeng/paragraphdata.hxx
+++ b/include/editeng/paragraphdata.hxx
diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index ab65b8994325..ab65b8994325 100644
--- a/editeng/inc/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
diff --git a/editeng/inc/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index 38630c78f86c..38630c78f86c 100644
--- a/editeng/inc/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
diff --git a/editeng/inc/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx
index 9c4c47cce882..9c4c47cce882 100644
--- a/editeng/inc/editeng/pgrditem.hxx
+++ b/include/editeng/pgrditem.hxx
diff --git a/editeng/inc/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index 55fee950d8f0..55fee950d8f0 100644
--- a/editeng/inc/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
diff --git a/editeng/inc/editeng/postitem.hxx b/include/editeng/postitem.hxx
index e547d5a5e438..e547d5a5e438 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
diff --git a/editeng/inc/editeng/prntitem.hxx b/include/editeng/prntitem.hxx
index 050131953dc3..050131953dc3 100644
--- a/editeng/inc/editeng/prntitem.hxx
+++ b/include/editeng/prntitem.hxx
diff --git a/editeng/inc/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 37f2bec77998..37f2bec77998 100644
--- a/editeng/inc/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
diff --git a/editeng/inc/editeng/prszitem.hxx b/include/editeng/prszitem.hxx
index d89669d8eca2..d89669d8eca2 100644
--- a/editeng/inc/editeng/prszitem.hxx
+++ b/include/editeng/prszitem.hxx
diff --git a/editeng/inc/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index e98fb8e4e129..e98fb8e4e129 100644
--- a/editeng/inc/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index f58234baf042..f58234baf042 100644
--- a/editeng/inc/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx
index a50f82d9d951..a50f82d9d951 100644
--- a/editeng/inc/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
diff --git a/editeng/inc/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index e76c77a7ec4e..e76c77a7ec4e 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
diff --git a/editeng/inc/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index d738a8794f5f..d738a8794f5f 100644
--- a/editeng/inc/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
diff --git a/editeng/inc/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index df70d40c47cf..df70d40c47cf 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
diff --git a/editeng/inc/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index a7a0a9f0665c..a7a0a9f0665c 100644
--- a/editeng/inc/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
diff --git a/editeng/inc/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index d4c9b8da8732..d4c9b8da8732 100644
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
diff --git a/editeng/inc/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 4f54d8f2f11b..4f54d8f2f11b 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
diff --git a/editeng/inc/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 2759bebcd0ea..2759bebcd0ea 100644
--- a/editeng/inc/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
diff --git a/editeng/inc/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 858157453aa1..858157453aa1 100644
--- a/editeng/inc/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
diff --git a/editeng/inc/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 84c00a28634b..84c00a28634b 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
diff --git a/editeng/inc/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 684a1838c731..684a1838c731 100644
--- a/editeng/inc/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
diff --git a/editeng/inc/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index f8eca761395b..f8eca761395b 100644
--- a/editeng/inc/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
diff --git a/editeng/inc/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index dfdddde4b54b..dfdddde4b54b 100644
--- a/editeng/inc/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
diff --git a/editeng/inc/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 700db5760ad1..700db5760ad1 100644
--- a/editeng/inc/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
diff --git a/editeng/inc/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 7d1a88dfa81a..7d1a88dfa81a 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
diff --git a/editeng/inc/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index f57c01bb3d3f..f57c01bb3d3f 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 25cf36f17356..25cf36f17356 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
diff --git a/editeng/inc/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index c6e067a6a633..c6e067a6a633 100644
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 9e5bba23e56b..9e5bba23e56b 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
diff --git a/editeng/inc/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx
index 711affaf2c1e..711affaf2c1e 100644
--- a/editeng/inc/editeng/unofdesc.hxx
+++ b/include/editeng/unofdesc.hxx
diff --git a/editeng/inc/editeng/unofield.hxx b/include/editeng/unofield.hxx
index d496e7217efc..d496e7217efc 100644
--- a/editeng/inc/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
diff --git a/editeng/inc/editeng/unofored.hxx b/include/editeng/unofored.hxx
index 5c88119f3a8f..5c88119f3a8f 100644
--- a/editeng/inc/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
diff --git a/editeng/inc/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index 68ee89160944..68ee89160944 100644
--- a/editeng/inc/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
diff --git a/editeng/inc/editeng/unoipset.hxx b/include/editeng/unoipset.hxx
index 584eb367f5a1..584eb367f5a1 100644
--- a/editeng/inc/editeng/unoipset.hxx
+++ b/include/editeng/unoipset.hxx
diff --git a/editeng/inc/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 09f570228f95..09f570228f95 100644
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
diff --git a/editeng/inc/editeng/unonames.hxx b/include/editeng/unonames.hxx
index 3a5984452773..3a5984452773 100644
--- a/editeng/inc/editeng/unonames.hxx
+++ b/include/editeng/unonames.hxx
diff --git a/editeng/inc/editeng/unonrule.hxx b/include/editeng/unonrule.hxx
index 985e3e9193bb..985e3e9193bb 100644
--- a/editeng/inc/editeng/unonrule.hxx
+++ b/include/editeng/unonrule.hxx
diff --git a/editeng/inc/editeng/unopracc.hxx b/include/editeng/unopracc.hxx
index c2d3fdc746f3..c2d3fdc746f3 100644
--- a/editeng/inc/editeng/unopracc.hxx
+++ b/include/editeng/unopracc.hxx
diff --git a/editeng/inc/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 38ba3bdb4961..38ba3bdb4961 100644
--- a/editeng/inc/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
diff --git a/editeng/inc/editeng/unotext.hxx b/include/editeng/unotext.hxx
index b5a5e02a8c1b..b5a5e02a8c1b 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
diff --git a/editeng/inc/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx
index 24031f93c847..24031f93c847 100644
--- a/editeng/inc/editeng/unoviwou.hxx
+++ b/include/editeng/unoviwou.hxx
diff --git a/editeng/inc/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index b10d74361dc8..b10d74361dc8 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
diff --git a/editeng/inc/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 8602702a00f7..8602702a00f7 100644
--- a/editeng/inc/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx
index c1ad81587f42..c1ad81587f42 100644
--- a/editeng/inc/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
diff --git a/editeng/inc/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index b74b2f406a71..b74b2f406a71 100644
--- a/editeng/inc/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index d361ab79c8d0..d361ab79c8d0 100644
--- a/editeng/inc/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
diff --git a/filter/inc/filter/dllapi.h b/include/filter/dllapi.h
index 9b94621feedf..9b94621feedf 100644
--- a/filter/inc/filter/dllapi.h
+++ b/include/filter/dllapi.h
diff --git a/filter/inc/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx
index b70f649b05c3..b70f649b05c3 100644
--- a/filter/inc/filter/msfilter/countryid.hxx
+++ b/include/filter/msfilter/countryid.hxx
diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx
index e4e9e90a5a6e..e4e9e90a5a6e 100644
--- a/filter/inc/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
diff --git a/filter/inc/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx
index ca2fcc368c46..ca2fcc368c46 100644
--- a/filter/inc/filter/msfilter/dffrecordheader.hxx
+++ b/include/filter/msfilter/dffrecordheader.hxx
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index b57d269d30b0..b57d269d30b0 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index f321441e2941..f321441e2941 100644
--- a/filter/inc/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 6359277f49f4..6359277f49f4 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
diff --git a/filter/inc/filter/msfilter/msfilterdllapi.h b/include/filter/msfilter/msfilterdllapi.h
index 03816baa92fc..03816baa92fc 100644
--- a/filter/inc/filter/msfilter/msfilterdllapi.h
+++ b/include/filter/msfilter/msfilterdllapi.h
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index 79815e49126e..79815e49126e 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
diff --git a/filter/inc/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index 468fa6284513..468fa6284513 100644
--- a/filter/inc/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index fc80f3115177..fc80f3115177 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index bafcc461a598..bafcc461a598 100644
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
diff --git a/filter/inc/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index b8d3c2c6d8ca..b8d3c2c6d8ca 100644
--- a/filter/inc/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 2fbf096aec58..2fbf096aec58 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 8f87401edee5..8f87401edee5 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
diff --git a/filter/inc/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index f50e4d10ea83..f50e4d10ea83 100644
--- a/filter/inc/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx
index cd9b3b5b69c6..cd9b3b5b69c6 100644
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/include/formula/ExternalReferenceHelper.hxx
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index b53bb2df4316..b53bb2df4316 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index 07945ca27101..07945ca27101 100644
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx
index bee4bac3953e..bee4bac3953e 100644
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 1747c2f2ddce..1747c2f2ddce 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
diff --git a/formula/inc/formula/compiler.hrc b/include/formula/compiler.hrc
index 053947c2a796..053947c2a796 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
diff --git a/formula/inc/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index 1e145e04132b..1e145e04132b 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
diff --git a/formula/inc/formula/formdata.hxx b/include/formula/formdata.hxx
index 595ddb63fc5a..595ddb63fc5a 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
diff --git a/formula/inc/formula/formula.hxx b/include/formula/formula.hxx
index 5a55f5ca81d1..5a55f5ca81d1 100644
--- a/formula/inc/formula/formula.hxx
+++ b/include/formula/formula.hxx
diff --git a/formula/inc/formula/formuladllapi.h b/include/formula/formuladllapi.h
index b2f4b06bd1a8..b2f4b06bd1a8 100644
--- a/formula/inc/formula/formuladllapi.h
+++ b/include/formula/formuladllapi.h
diff --git a/formula/inc/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index 27c9b6683964..27c9b6683964 100644
--- a/formula/inc/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
diff --git a/formula/inc/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 6676117cdf20..6676117cdf20 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
diff --git a/formula/inc/formula/grammar.hxx b/include/formula/grammar.hxx
index 584aff1ae57f..584aff1ae57f 100644
--- a/formula/inc/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
diff --git a/formula/inc/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx
index 76fcee97fb57..76fcee97fb57 100644
--- a/formula/inc/formula/omoduleclient.hxx
+++ b/include/formula/omoduleclient.hxx
diff --git a/formula/inc/formula/opcode.hxx b/include/formula/opcode.hxx
index b94c066a624b..b94c066a624b 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
diff --git a/formula/inc/formula/token.hxx b/include/formula/token.hxx
index 3a174d7b9d4f..3a174d7b9d4f 100644
--- a/formula/inc/formula/token.hxx
+++ b/include/formula/token.hxx
diff --git a/formula/inc/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 875b055a621a..875b055a621a 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx
index e942de94924f..e942de94924f 100644
--- a/framework/inc/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
diff --git a/framework/inc/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 6390459be0f1..6390459be0f1 100644
--- a/framework/inc/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
diff --git a/framework/inc/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index def743378216..def743378216 100644
--- a/framework/inc/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
diff --git a/framework/inc/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx
index d78eefeced24..d78eefeced24 100644
--- a/framework/inc/framework/bmkmenu.hxx
+++ b/include/framework/bmkmenu.hxx
diff --git a/framework/inc/framework/configimporter.hxx b/include/framework/configimporter.hxx
index 06b6467f6c2a..06b6467f6c2a 100644
--- a/framework/inc/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
diff --git a/framework/inc/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx
index 1954a72b5c67..1954a72b5c67 100644
--- a/framework/inc/framework/documentundoguard.hxx
+++ b/include/framework/documentundoguard.hxx
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx
index 29694b7fb539..29694b7fb539 100644
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/include/framework/eventsconfiguration.hxx
diff --git a/framework/inc/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx
index 951474c3934d..951474c3934d 100644
--- a/framework/inc/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
diff --git a/framework/inc/framework/fwedllapi.h b/include/framework/fwedllapi.h
index 14201508768a..14201508768a 100644
--- a/framework/inc/framework/fwedllapi.h
+++ b/include/framework/fwedllapi.h
diff --git a/framework/inc/framework/iguard.hxx b/include/framework/iguard.hxx
index a522d6225e43..a522d6225e43 100644
--- a/framework/inc/framework/iguard.hxx
+++ b/include/framework/iguard.hxx
diff --git a/framework/inc/framework/imageproducer.hxx b/include/framework/imageproducer.hxx
index 0d9398f7b2a3..0d9398f7b2a3 100644
--- a/framework/inc/framework/imageproducer.hxx
+++ b/include/framework/imageproducer.hxx
diff --git a/framework/inc/framework/imutex.hxx b/include/framework/imutex.hxx
index f576297e0d14..f576297e0d14 100644
--- a/framework/inc/framework/imutex.hxx
+++ b/include/framework/imutex.hxx
diff --git a/framework/inc/framework/interaction.hxx b/include/framework/interaction.hxx
index 1cd56bbd36d9..1cd56bbd36d9 100644
--- a/framework/inc/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
diff --git a/framework/inc/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 1ccd6ba0d167..1ccd6ba0d167 100644
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/include/framework/menuextensionsupplier.hxx
index 6d3a6761e38e..6d3a6761e38e 100644
--- a/framework/inc/framework/menuextensionsupplier.hxx
+++ b/include/framework/menuextensionsupplier.hxx
diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index 5be9d52f62cf..5be9d52f62cf 100644
--- a/framework/inc/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
diff --git a/framework/inc/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx
index ce2b604f5e5e..ce2b604f5e5e 100644
--- a/framework/inc/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx
index e71a89fe0ca4..e71a89fe0ca4 100644
--- a/framework/inc/framework/statusbarconfiguration.hxx
+++ b/include/framework/statusbarconfiguration.hxx
diff --git a/framework/inc/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index c4cdc31a6329..c4cdc31a6329 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx
index a296231a07ea..a296231a07ea 100644
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/include/framework/toolboxconfiguration.hxx
diff --git a/framework/inc/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx
index ae91db981553..ae91db981553 100644
--- a/framework/inc/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
diff --git a/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h b/include/i18nlangtag/i18nlangtagdllapi.h
index ba9af35c08fe..ba9af35c08fe 100644
--- a/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h
+++ b/include/i18nlangtag/i18nlangtagdllapi.h
diff --git a/i18nlangtag/inc/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d4f5ca7a61b3..d4f5ca7a61b3 100644
--- a/i18nlangtag/inc/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
diff --git a/i18nlangtag/inc/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index e5ba011ab2ba..e5ba011ab2ba 100644
--- a/i18nlangtag/inc/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
diff --git a/i18nlangtag/inc/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 8148d1760de0..8148d1760de0 100644
--- a/i18nlangtag/inc/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
diff --git a/i18nutil/inc/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index a0867d1e687c..a0867d1e687c 100644
--- a/i18nutil/inc/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
diff --git a/i18nutil/inc/i18nutil/i18nutildllapi.h b/include/i18nutil/i18nutildllapi.h
index b208b51e9ee0..b208b51e9ee0 100644
--- a/i18nutil/inc/i18nutil/i18nutildllapi.h
+++ b/include/i18nutil/i18nutildllapi.h
diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx
index 533e4ad52c59..533e4ad52c59 100644
--- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx
+++ b/include/i18nutil/oneToOneMapping.hxx
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 8847b294fbdb..8847b294fbdb 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
diff --git a/i18nutil/inc/i18nutil/scripttypedetector.hxx b/include/i18nutil/scripttypedetector.hxx
index cf3b9b71e11b..cf3b9b71e11b 100644
--- a/i18nutil/inc/i18nutil/scripttypedetector.hxx
+++ b/include/i18nutil/scripttypedetector.hxx
diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index 7da0f5329803..7da0f5329803 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx
index 481239deca88..481239deca88 100644
--- a/i18nutil/inc/i18nutil/widthfolding.hxx
+++ b/include/i18nutil/widthfolding.hxx
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx
index 1cc8d83ab348..1cc8d83ab348 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/include/jvmaccess/classpath.hxx
diff --git a/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h b/include/jvmaccess/jvmaccessdllapi.h
index 0f6651b5dbf8..0f6651b5dbf8 100644
--- a/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h
+++ b/include/jvmaccess/jvmaccessdllapi.h
diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx
index 4d618d14d863..4d618d14d863 100644
--- a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx
index 57ac5ead39f4..57ac5ead39f4 100644
--- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx
+++ b/include/jvmaccess/virtualmachine.hxx
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/include/jvmfwk/framework.h
index f1399e0b88f1..f1399e0b88f1 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.h
index 52c8273b5954..52c8273b5954 100644
--- a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
+++ b/include/jvmfwk/jvmfwkdllapi.h
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/include/jvmfwk/jvmfwkplugindllapi.h
index d96016e261bb..d96016e261bb 100644
--- a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
+++ b/include/jvmfwk/jvmfwkplugindllapi.h
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/include/jvmfwk/vendorplugin.h
index 5ca5e10009ba..5ca5e10009ba 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/include/jvmfwk/vendorplugin.h
diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 9dec2d6dc15e..9dec2d6dc15e 100644
--- a/linguistic/inc/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
diff --git a/linguistic/inc/linguistic/lngdllapi.h b/include/linguistic/lngdllapi.h
index 0da35fe7e123..0da35fe7e123 100644
--- a/linguistic/inc/linguistic/lngdllapi.h
+++ b/include/linguistic/lngdllapi.h
diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 3995d87cc1e4..3995d87cc1e4 100644
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
diff --git a/linguistic/inc/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx
index 2f8339f9b0b8..2f8339f9b0b8 100644
--- a/linguistic/inc/linguistic/lngprops.hxx
+++ b/include/linguistic/lngprops.hxx
diff --git a/linguistic/inc/linguistic/misc.hxx b/include/linguistic/misc.hxx
index c15d2fc70dab..c15d2fc70dab 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index 92f9cd680c77..92f9cd680c77 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
diff --git a/o3tl/inc/o3tl/compat_functional.hxx b/include/o3tl/compat_functional.hxx
index 00ae33cb23bb..00ae33cb23bb 100644
--- a/o3tl/inc/o3tl/compat_functional.hxx
+++ b/include/o3tl/compat_functional.hxx
diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index b54f99d0f190..b54f99d0f190 100644
--- a/o3tl/inc/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
diff --git a/o3tl/inc/o3tl/heap_ptr.hxx b/include/o3tl/heap_ptr.hxx
index 713aa21c41b8..713aa21c41b8 100644
--- a/o3tl/inc/o3tl/heap_ptr.hxx
+++ b/include/o3tl/heap_ptr.hxx
diff --git a/o3tl/inc/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx
index b05bda37ba40..b05bda37ba40 100644
--- a/o3tl/inc/o3tl/lazy_update.hxx
+++ b/include/o3tl/lazy_update.hxx
diff --git a/o3tl/inc/o3tl/range.hxx b/include/o3tl/range.hxx
index a5ebacb4c6b8..a5ebacb4c6b8 100644
--- a/o3tl/inc/o3tl/range.hxx
+++ b/include/o3tl/range.hxx
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index 776fd5605e6f..776fd5605e6f 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
diff --git a/o3tl/inc/o3tl/vector_pool.hxx b/include/o3tl/vector_pool.hxx
index b132289af3ab..b132289af3ab 100644
--- a/o3tl/inc/o3tl/vector_pool.hxx
+++ b/include/o3tl/vector_pool.hxx
diff --git a/oox/inc/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 64b06d4244ef..64b06d4244ef 100644
--- a/oox/inc/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
diff --git a/oox/inc/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index f11dc1d6260a..f11dc1d6260a 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
diff --git a/oox/inc/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index f1a0c7db38b2..f1a0c7db38b2 100644
--- a/oox/inc/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
diff --git a/oox/inc/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 40b5e763998f..40b5e763998f 100644
--- a/oox/inc/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 05c7063d3925..05c7063d3925 100644
--- a/oox/inc/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
diff --git a/oox/inc/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 6f4fc40499c7..6f4fc40499c7 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
diff --git a/oox/inc/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index cd9573b0f0bd..cd9573b0f0bd 100644
--- a/oox/inc/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index 236e212e6e32..236e212e6e32 100644
--- a/oox/inc/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 21ad03619fd1..21ad03619fd1 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
diff --git a/oox/inc/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index 9e417c03d01a..9e417c03d01a 100644
--- a/oox/inc/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
diff --git a/oox/inc/oox/core/relations.hxx b/include/oox/core/relations.hxx
index b78d0d3056eb..b78d0d3056eb 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
diff --git a/oox/inc/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index d42e5d1ad8b7..d42e5d1ad8b7 100644
--- a/oox/inc/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 4b5c1e093657..4b5c1e093657 100644
--- a/oox/inc/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
diff --git a/oox/inc/oox/dllapi.h b/include/oox/dllapi.h
index 6026aef0ae58..6026aef0ae58 100644
--- a/oox/inc/oox/dllapi.h
+++ b/include/oox/dllapi.h
diff --git a/oox/inc/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx
index d22a53f23227..d22a53f23227 100644
--- a/oox/inc/oox/drawingml/chart/axiscontext.hxx
+++ b/include/oox/drawingml/chart/axiscontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx
index fac1d67c8997..fac1d67c8997 100644
--- a/oox/inc/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx
index 30ceae499b0a..30ceae499b0a 100644
--- a/oox/inc/oox/drawingml/chart/axismodel.hxx
+++ b/include/oox/drawingml/chart/axismodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx
index 218e7bf4406e..218e7bf4406e 100644
--- a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx
+++ b/include/oox/drawingml/chart/chartcontextbase.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index bbc7e0fafd28..bbc7e0fafd28 100644
--- a/oox/inc/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx
index 43d27f586514..43d27f586514 100644
--- a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx
index 2bdeb013b1b3..2bdeb013b1b3 100644
--- a/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx
+++ b/include/oox/drawingml/chart/chartspaceconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx
index c9b1e0c6b776..c9b1e0c6b776 100644
--- a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx
+++ b/include/oox/drawingml/chart/chartspacefragment.hxx
diff --git a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx
index b3d3405c4670..b3d3405c4670 100644
--- a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx
+++ b/include/oox/drawingml/chart/chartspacemodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx
index 21a03441e803..21a03441e803 100644
--- a/oox/inc/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
diff --git a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx
index 163b99c868e4..163b99c868e4 100644
--- a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx
+++ b/include/oox/drawingml/chart/datasourcecontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx
index e8b5649e1bef..e8b5649e1bef 100644
--- a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx
+++ b/include/oox/drawingml/chart/datasourceconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index d43048ef071c..d43048ef071c 100644
--- a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index 985221ec394b..985221ec394b 100644
--- a/oox/inc/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx
index 5b2bb727f4fd..5b2bb727f4fd 100644
--- a/oox/inc/oox/drawingml/chart/objectformatter.hxx
+++ b/include/oox/drawingml/chart/objectformatter.hxx
diff --git a/oox/inc/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx
index d9966a8d8bf4..d9966a8d8bf4 100644
--- a/oox/inc/oox/drawingml/chart/plotareacontext.hxx
+++ b/include/oox/drawingml/chart/plotareacontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx
index 6796ffbd6a1c..6796ffbd6a1c 100644
--- a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx
+++ b/include/oox/drawingml/chart/plotareaconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx
index 2afd6ccdd1da..2afd6ccdd1da 100644
--- a/oox/inc/oox/drawingml/chart/plotareamodel.hxx
+++ b/include/oox/drawingml/chart/plotareamodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx
index e31156dd2796..e31156dd2796 100644
--- a/oox/inc/oox/drawingml/chart/seriescontext.hxx
+++ b/include/oox/drawingml/chart/seriescontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx
index 073073c5bbe7..073073c5bbe7 100644
--- a/oox/inc/oox/drawingml/chart/seriesconverter.hxx
+++ b/include/oox/drawingml/chart/seriesconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx
index 998065f7f8ad..998065f7f8ad 100644
--- a/oox/inc/oox/drawingml/chart/seriesmodel.hxx
+++ b/include/oox/drawingml/chart/seriesmodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx
index b00a9ed45b6d..b00a9ed45b6d 100644
--- a/oox/inc/oox/drawingml/chart/titlecontext.hxx
+++ b/include/oox/drawingml/chart/titlecontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx
index ad3694568efe..ad3694568efe 100644
--- a/oox/inc/oox/drawingml/chart/titleconverter.hxx
+++ b/include/oox/drawingml/chart/titleconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx
index f365d0b6ec89..f365d0b6ec89 100644
--- a/oox/inc/oox/drawingml/chart/titlemodel.hxx
+++ b/include/oox/drawingml/chart/titlemodel.hxx
diff --git a/oox/inc/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx
index 52667817ff0d..52667817ff0d 100644
--- a/oox/inc/oox/drawingml/chart/typegroupcontext.hxx
+++ b/include/oox/drawingml/chart/typegroupcontext.hxx
diff --git a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx
index dfce05065c18..dfce05065c18 100644
--- a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx
+++ b/include/oox/drawingml/chart/typegroupconverter.hxx
diff --git a/oox/inc/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx
index 1949a3ee892e..1949a3ee892e 100644
--- a/oox/inc/oox/drawingml/chart/typegroupmodel.hxx
+++ b/include/oox/drawingml/chart/typegroupmodel.hxx
diff --git a/oox/inc/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 7c4f0106cb43..7c4f0106cb43 100644
--- a/oox/inc/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
diff --git a/oox/inc/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx
index 466b852a37cf..466b852a37cf 100644
--- a/oox/inc/oox/drawingml/clrschemecontext.hxx
+++ b/include/oox/drawingml/clrschemecontext.hxx
diff --git a/oox/inc/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index b58f0b8ae5b3..b58f0b8ae5b3 100644
--- a/oox/inc/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
diff --git a/oox/inc/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx
index aaacfd44d5b7..aaacfd44d5b7 100644
--- a/oox/inc/oox/drawingml/colorchoicecontext.hxx
+++ b/include/oox/drawingml/colorchoicecontext.hxx
diff --git a/oox/inc/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 48a03ae317af..48a03ae317af 100644
--- a/oox/inc/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
diff --git a/oox/inc/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx
index 3920881f123a..3920881f123a 100644
--- a/oox/inc/oox/drawingml/customshapegeometry.hxx
+++ b/include/oox/drawingml/customshapegeometry.hxx
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx
index e44f20db95e2..e44f20db95e2 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx b/include/oox/drawingml/diagram/diagram.hxx
index e37c1a44e42f..e37c1a44e42f 100644
--- a/oox/inc/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 5df664ee66a4..5df664ee66a4 100644
--- a/oox/inc/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
diff --git a/oox/inc/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx
index 55c5ec34a20f..55c5ec34a20f 100644
--- a/oox/inc/oox/drawingml/effectproperties.hxx
+++ b/include/oox/drawingml/effectproperties.hxx
diff --git a/oox/inc/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx
index cd5e2eba28f5..cd5e2eba28f5 100644
--- a/oox/inc/oox/drawingml/effectpropertiescontext.hxx
+++ b/include/oox/drawingml/effectpropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx b/include/oox/drawingml/embeddedwavaudiofile.hxx
index 97cebd54947b..97cebd54947b 100644
--- a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx
+++ b/include/oox/drawingml/embeddedwavaudiofile.hxx
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index fb9aa849e92e..fb9aa849e92e 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
diff --git a/oox/inc/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
index 81d8a6e0db20..81d8a6e0db20 100644
--- a/oox/inc/oox/drawingml/fillpropertiesgroupcontext.hxx
+++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index c5984d503363..c5984d503363 100644
--- a/oox/inc/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
diff --git a/oox/inc/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx
index 8a60bf20ab5c..8a60bf20ab5c 100644
--- a/oox/inc/oox/drawingml/guidcontext.hxx
+++ b/include/oox/drawingml/guidcontext.hxx
diff --git a/oox/inc/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index 7ffdc04230a0..7ffdc04230a0 100644
--- a/oox/inc/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
diff --git a/oox/inc/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx
index e0454ddb2250..e0454ddb2250 100644
--- a/oox/inc/oox/drawingml/linepropertiescontext.hxx
+++ b/include/oox/drawingml/linepropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx
index b8b1d5b95ede..b8b1d5b95ede 100644
--- a/oox/inc/oox/drawingml/objectdefaultcontext.hxx
+++ b/include/oox/drawingml/objectdefaultcontext.hxx
diff --git a/oox/inc/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx
index cc3341ddf310..cc3341ddf310 100644
--- a/oox/inc/oox/drawingml/scene3dcontext.hxx
+++ b/include/oox/drawingml/scene3dcontext.hxx
diff --git a/oox/inc/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index f8a58ec5340b..f8a58ec5340b 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
diff --git a/oox/inc/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx
index d1891402757c..d1891402757c 100644
--- a/oox/inc/oox/drawingml/shape3dproperties.hxx
+++ b/include/oox/drawingml/shape3dproperties.hxx
diff --git a/oox/inc/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index 277ee91017ec..277ee91017ec 100644
--- a/oox/inc/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
diff --git a/oox/inc/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index 65b86ac99567..65b86ac99567 100644
--- a/oox/inc/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
diff --git a/oox/inc/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx
index 31da8a9c0f23..31da8a9c0f23 100644
--- a/oox/inc/oox/drawingml/shapepropertiescontext.hxx
+++ b/include/oox/drawingml/shapepropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index a5cc12f5484c..a5cc12f5484c 100644
--- a/oox/inc/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
diff --git a/oox/inc/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx
index 88338a16b59a..88338a16b59a 100644
--- a/oox/inc/oox/drawingml/shapestylecontext.hxx
+++ b/include/oox/drawingml/shapestylecontext.hxx
diff --git a/oox/inc/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx
index 1fa773fb57dc..1fa773fb57dc 100644
--- a/oox/inc/oox/drawingml/spdefcontext.hxx
+++ b/include/oox/drawingml/spdefcontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablebackgroundstylecontext.hxx b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
index 185987df8ad7..185987df8ad7 100644
--- a/oox/inc/oox/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablecell.hxx b/include/oox/drawingml/table/tablecell.hxx
index 9bb721f8599a..9bb721f8599a 100644
--- a/oox/inc/oox/drawingml/table/tablecell.hxx
+++ b/include/oox/drawingml/table/tablecell.hxx
diff --git a/oox/inc/oox/drawingml/table/tablecellcontext.hxx b/include/oox/drawingml/table/tablecellcontext.hxx
index a2c04bbff9a7..a2c04bbff9a7 100644
--- a/oox/inc/oox/drawingml/table/tablecellcontext.hxx
+++ b/include/oox/drawingml/table/tablecellcontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablecontext.hxx b/include/oox/drawingml/table/tablecontext.hxx
index 175f7f84cb43..175f7f84cb43 100644
--- a/oox/inc/oox/drawingml/table/tablecontext.hxx
+++ b/include/oox/drawingml/table/tablecontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablepartstylecontext.hxx b/include/oox/drawingml/table/tablepartstylecontext.hxx
index 14b38547d9f4..14b38547d9f4 100644
--- a/oox/inc/oox/drawingml/table/tablepartstylecontext.hxx
+++ b/include/oox/drawingml/table/tablepartstylecontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx
index 8c584b1f8959..8c584b1f8959 100644
--- a/oox/inc/oox/drawingml/table/tableproperties.hxx
+++ b/include/oox/drawingml/table/tableproperties.hxx
diff --git a/oox/inc/oox/drawingml/table/tablerow.hxx b/include/oox/drawingml/table/tablerow.hxx
index 299ffabfd8b1..299ffabfd8b1 100644
--- a/oox/inc/oox/drawingml/table/tablerow.hxx
+++ b/include/oox/drawingml/table/tablerow.hxx
diff --git a/oox/inc/oox/drawingml/table/tablerowcontext.hxx b/include/oox/drawingml/table/tablerowcontext.hxx
index 58ab0da0cd3a..58ab0da0cd3a 100644
--- a/oox/inc/oox/drawingml/table/tablerowcontext.hxx
+++ b/include/oox/drawingml/table/tablerowcontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestyle.hxx b/include/oox/drawingml/table/tablestyle.hxx
index b31b5891a32b..b31b5891a32b 100644
--- a/oox/inc/oox/drawingml/table/tablestyle.hxx
+++ b/include/oox/drawingml/table/tablestyle.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestylecellstylecontext.hxx b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
index ae0997ab6d88..ae0997ab6d88 100644
--- a/oox/inc/oox/drawingml/table/tablestylecellstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestylecontext.hxx b/include/oox/drawingml/table/tablestylecontext.hxx
index f9600d38365c..f9600d38365c 100644
--- a/oox/inc/oox/drawingml/table/tablestylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecontext.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestylelist.hxx b/include/oox/drawingml/table/tablestylelist.hxx
index 320609d064d9..320609d064d9 100644
--- a/oox/inc/oox/drawingml/table/tablestylelist.hxx
+++ b/include/oox/drawingml/table/tablestylelist.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
index d6ef77f8614c..d6ef77f8614c 100644
--- a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestylepart.hxx b/include/oox/drawingml/table/tablestylepart.hxx
index abfb21c890d9..abfb21c890d9 100644
--- a/oox/inc/oox/drawingml/table/tablestylepart.hxx
+++ b/include/oox/drawingml/table/tablestylepart.hxx
diff --git a/oox/inc/oox/drawingml/table/tablestyletextstylecontext.hxx b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
index 10714743ad58..10714743ad58 100644
--- a/oox/inc/oox/drawingml/table/tablestyletextstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
diff --git a/oox/inc/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx
index 2d77cf277df6..2d77cf277df6 100644
--- a/oox/inc/oox/drawingml/textbody.hxx
+++ b/include/oox/drawingml/textbody.hxx
diff --git a/oox/inc/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx
index d46272e853a6..d46272e853a6 100644
--- a/oox/inc/oox/drawingml/textbodycontext.hxx
+++ b/include/oox/drawingml/textbodycontext.hxx
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx
index f8800be29659..f8800be29659 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/include/oox/drawingml/textbodyproperties.hxx
diff --git a/oox/inc/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx
index e907a60b94d8..e907a60b94d8 100644
--- a/oox/inc/oox/drawingml/textbodypropertiescontext.hxx
+++ b/include/oox/drawingml/textbodypropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx
index 99792fe7725d..99792fe7725d 100644
--- a/oox/inc/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
diff --git a/oox/inc/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx
index f31e86b27ca4..f31e86b27ca4 100644
--- a/oox/inc/oox/drawingml/textcharacterpropertiescontext.hxx
+++ b/include/oox/drawingml/textcharacterpropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx
index df98b0302560..df98b0302560 100644
--- a/oox/inc/oox/drawingml/textfield.hxx
+++ b/include/oox/drawingml/textfield.hxx
diff --git a/oox/inc/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx
index 3a50ea93620f..3a50ea93620f 100644
--- a/oox/inc/oox/drawingml/textfieldcontext.hxx
+++ b/include/oox/drawingml/textfieldcontext.hxx
diff --git a/oox/inc/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx
index 95a7a1716a0d..95a7a1716a0d 100644
--- a/oox/inc/oox/drawingml/textfont.hxx
+++ b/include/oox/drawingml/textfont.hxx
diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx
index 851c506af17e..851c506af17e 100644
--- a/oox/inc/oox/drawingml/textliststyle.hxx
+++ b/include/oox/drawingml/textliststyle.hxx
diff --git a/oox/inc/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx
index 2d480c709be5..2d480c709be5 100644
--- a/oox/inc/oox/drawingml/textliststylecontext.hxx
+++ b/include/oox/drawingml/textliststylecontext.hxx
diff --git a/oox/inc/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx
index 37c53268b001..37c53268b001 100644
--- a/oox/inc/oox/drawingml/textparagraph.hxx
+++ b/include/oox/drawingml/textparagraph.hxx
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx
index 1cb8215a3fc1..1cb8215a3fc1 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/include/oox/drawingml/textparagraphproperties.hxx
diff --git a/oox/inc/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx
index db0f3426a680..db0f3426a680 100644
--- a/oox/inc/oox/drawingml/textparagraphpropertiescontext.hxx
+++ b/include/oox/drawingml/textparagraphpropertiescontext.hxx
diff --git a/oox/inc/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx
index 0e215bf68973..0e215bf68973 100644
--- a/oox/inc/oox/drawingml/textrun.hxx
+++ b/include/oox/drawingml/textrun.hxx
diff --git a/oox/inc/oox/drawingml/textspacing.hxx b/include/oox/drawingml/textspacing.hxx
index c85936283b4b..c85936283b4b 100644
--- a/oox/inc/oox/drawingml/textspacing.hxx
+++ b/include/oox/drawingml/textspacing.hxx
diff --git a/oox/inc/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index f167c43a4fd4..f167c43a4fd4 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
diff --git a/oox/inc/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx
index a3d36a9d8225..a3d36a9d8225 100644
--- a/oox/inc/oox/drawingml/themeelementscontext.hxx
+++ b/include/oox/drawingml/themeelementscontext.hxx
diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index 61062775fa37..61062775fa37 100644
--- a/oox/inc/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
diff --git a/oox/inc/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx
index 6bbbe191e77c..6bbbe191e77c 100644
--- a/oox/inc/oox/drawingml/transform2dcontext.hxx
+++ b/include/oox/drawingml/transform2dcontext.hxx
diff --git a/oox/inc/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index d041dcc0be66..d041dcc0be66 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 043bb73ecfa8..043bb73ecfa8 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
diff --git a/oox/inc/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index b58500ef8f3c..b58500ef8f3c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
diff --git a/oox/inc/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 43f39002059b..43f39002059b 100644
--- a/oox/inc/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index ffd24d4de808..ffd24d4de808 100644
--- a/oox/inc/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
diff --git a/oox/inc/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 10fc8922dc4a..10fc8922dc4a 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
diff --git a/oox/inc/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index fa13a49ea090..fa13a49ea090 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
diff --git a/oox/inc/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 39b4c0d9ec72..39b4c0d9ec72 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
diff --git a/oox/inc/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 04c3b3375742..04c3b3375742 100644
--- a/oox/inc/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
diff --git a/oox/inc/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 54212a65bccf..54212a65bccf 100644
--- a/oox/inc/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
diff --git a/oox/inc/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index 55f41cf0a3b3..55f41cf0a3b3 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 64d85357c2e8..64d85357c2e8 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 0882821e9834..0882821e9834 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index d9ab979de019..d9ab979de019 100644
--- a/oox/inc/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index f3b27f05b1e2..f3b27f05b1e2 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 0681716bc84f..0681716bc84f 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
diff --git a/oox/inc/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 4f8e738354d4..4f8e738354d4 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 253279a4c05a..253279a4c05a 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
diff --git a/oox/inc/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index ba0bdcfbb5c9..ba0bdcfbb5c9 100644
--- a/oox/inc/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
diff --git a/oox/inc/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index d03d891d93b5..d03d891d93b5 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
diff --git a/oox/inc/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 2c97b29677fa..2c97b29677fa 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
diff --git a/oox/inc/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx
index c980039442b1..c980039442b1 100644
--- a/oox/inc/oox/helper/refmap.hxx
+++ b/include/oox/helper/refmap.hxx
diff --git a/oox/inc/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx
index c0602b571c23..c0602b571c23 100644
--- a/oox/inc/oox/helper/refvector.hxx
+++ b/include/oox/helper/refvector.hxx
diff --git a/oox/inc/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index f318f01b4768..f318f01b4768 100644
--- a/oox/inc/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
diff --git a/oox/inc/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx
index 16a2d5145e9d..16a2d5145e9d 100644
--- a/oox/inc/oox/helper/textinputstream.hxx
+++ b/include/oox/helper/textinputstream.hxx
diff --git a/oox/inc/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index e46df41387d7..e46df41387d7 100644
--- a/oox/inc/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
diff --git a/oox/inc/oox/mathml/export.hxx b/include/oox/mathml/export.hxx
index 3a0f3788a77f..3a0f3788a77f 100644
--- a/oox/inc/oox/mathml/export.hxx
+++ b/include/oox/mathml/export.hxx
diff --git a/oox/inc/oox/mathml/import.hxx b/include/oox/mathml/import.hxx
index fe436d41a047..fe436d41a047 100644
--- a/oox/inc/oox/mathml/import.hxx
+++ b/include/oox/mathml/import.hxx
diff --git a/oox/inc/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index c3c16482164f..c3c16482164f 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index b6a937d14c4c..b6a937d14c4c 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index eb4aec532d1f..eb4aec532d1f 100644
--- a/oox/inc/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 84e3a3ecbcdd..84e3a3ecbcdd 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index 653f23c30479..653f23c30479 100644
--- a/oox/inc/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
diff --git a/oox/inc/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index 9dbec1786261..9dbec1786261 100644
--- a/oox/inc/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
diff --git a/oox/inc/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index e75a0cd07588..e75a0cd07588 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index 9d97a8d95f71..9d97a8d95f71 100644
--- a/oox/inc/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
diff --git a/oox/inc/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index 1b48eab8213d..1b48eab8213d 100644
--- a/oox/inc/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index 0de80153baed..0de80153baed 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index a8faee21ff6e..a8faee21ff6e 100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
diff --git a/oox/inc/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index 7e0cd4986bd7..7e0cd4986bd7 100644
--- a/oox/inc/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx
index 70dcd3913b9a..70dcd3913b9a 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/include/oox/ole/vbamodule.hxx
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f742138756b5..f742138756b5 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
diff --git a/oox/inc/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index ba63991def2a..ba63991def2a 100644
--- a/oox/inc/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
diff --git a/oox/inc/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index 05926d44b796..05926d44b796 100644
--- a/oox/inc/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
diff --git a/oox/inc/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index 1095cd0223db..1095cd0223db 100644
--- a/oox/inc/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
diff --git a/oox/inc/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index ed913c8bbe2c..ed913c8bbe2c 100644
--- a/oox/inc/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index f369c5e526b8..f369c5e526b8 100644
--- a/oox/inc/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index bf964fe5d310..bf964fe5d310 100644
--- a/oox/inc/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
diff --git a/oox/inc/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 4d0a3cb65f1d..4d0a3cb65f1d 100644
--- a/oox/inc/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
diff --git a/oox/inc/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index 80983182b73d..80983182b73d 100644
--- a/oox/inc/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
diff --git a/oox/inc/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index 180098a67166..180098a67166 100644
--- a/oox/inc/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
diff --git a/oox/inc/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 035ea8cdc5c1..035ea8cdc5c1 100644
--- a/oox/inc/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index aa485adf9347..aa485adf9347 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
diff --git a/oox/inc/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 59e46b3d54b5..59e46b3d54b5 100644
--- a/oox/inc/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index c7e60c76e823..c7e60c76e823 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
diff --git a/oox/inc/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index f979c6efd3db..f979c6efd3db 100644
--- a/oox/inc/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index ae26cb233e8c..ae26cb233e8c 100644
--- a/oox/inc/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
diff --git a/oox/inc/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx
index 045f6ff1ccda..045f6ff1ccda 100644
--- a/oox/inc/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
diff --git a/oox/inc/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index c1e9c1478ec6..c1e9c1478ec6 100644
--- a/oox/inc/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 6f58d81813c3..6f58d81813c3 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
diff --git a/oox/inc/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index a50e8be60fd3..a50e8be60fd3 100644
--- a/oox/inc/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 01f701d63dfe..01f701d63dfe 100644
--- a/oox/inc/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
diff --git a/oox/inc/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 077d5a8f5813..077d5a8f5813 100644
--- a/oox/inc/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
diff --git a/oox/inc/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index d1f1040c75ba..d1f1040c75ba 100644
--- a/oox/inc/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
diff --git a/oox/inc/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 769cc0e03943..769cc0e03943 100644
--- a/oox/inc/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
diff --git a/oox/inc/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index baacbc94add4..baacbc94add4 100644
--- a/oox/inc/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
diff --git a/oox/inc/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx
index 78eeaa93cc40..78eeaa93cc40 100644
--- a/oox/inc/oox/token/namespacemap.hxx
+++ b/include/oox/token/namespacemap.hxx
diff --git a/oox/inc/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx
index 931eaed0172b..931eaed0172b 100644
--- a/oox/inc/oox/token/propertynames.hxx
+++ b/include/oox/token/propertynames.hxx
diff --git a/oox/inc/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 84dc70d03fac..84dc70d03fac 100644
--- a/oox/inc/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index ad7790962366..ad7790962366 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx
index f0947998a092..f0947998a092 100644
--- a/oox/inc/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index 79fa38009e4d..79fa38009e4d 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index 7c8e13160722..7c8e13160722 100644
--- a/oox/inc/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 7b6a4a9376c7..7b6a4a9376c7 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index 5e6a2c2a9d75..5e6a2c2a9d75 100644
--- a/oox/inc/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
diff --git a/oox/inc/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 803674088e37..803674088e37 100644
--- a/oox/inc/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 4975e6bb26b6..4975e6bb26b6 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 47d71ac41b41..47d71ac41b41 100644
--- a/oox/inc/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
diff --git a/package/inc/package/Deflater.hxx b/include/package/Deflater.hxx
index 7531e3a1ac66..7531e3a1ac66 100644
--- a/package/inc/package/Deflater.hxx
+++ b/include/package/Deflater.hxx
diff --git a/package/inc/package/Inflater.hxx b/include/package/Inflater.hxx
index 284451750e43..284451750e43 100644
--- a/package/inc/package/Inflater.hxx
+++ b/include/package/Inflater.hxx
diff --git a/package/inc/package/packagedllapi.hxx b/include/package/packagedllapi.hxx
index 72a3dab60f07..72a3dab60f07 100644
--- a/package/inc/package/packagedllapi.hxx
+++ b/include/package/packagedllapi.hxx
diff --git a/registry/inc/registry/reader.h b/include/registry/reader.h
index 263215a92722..263215a92722 100644
--- a/registry/inc/registry/reader.h
+++ b/include/registry/reader.h
diff --git a/registry/inc/registry/reader.hxx b/include/registry/reader.hxx
index a867f3b1185a..a867f3b1185a 100644
--- a/registry/inc/registry/reader.hxx
+++ b/include/registry/reader.hxx
diff --git a/registry/inc/registry/reflread.hxx b/include/registry/reflread.hxx
index 541692443127..541692443127 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/include/registry/reflread.hxx
diff --git a/registry/inc/registry/refltype.hxx b/include/registry/refltype.hxx
index 0de7716a9ed3..0de7716a9ed3 100644
--- a/registry/inc/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
diff --git a/registry/inc/registry/reflwrit.hxx b/include/registry/reflwrit.hxx
index 8e84aa9b1483..8e84aa9b1483 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/include/registry/reflwrit.hxx
diff --git a/registry/inc/registry/regdllapi.h b/include/registry/regdllapi.h
index 5116a7062d24..5116a7062d24 100644
--- a/registry/inc/registry/regdllapi.h
+++ b/include/registry/regdllapi.h
diff --git a/registry/inc/registry/registry.h b/include/registry/registry.h
index 030e1a12a5de..030e1a12a5de 100644
--- a/registry/inc/registry/registry.h
+++ b/include/registry/registry.h
diff --git a/registry/inc/registry/registry.hxx b/include/registry/registry.hxx
index d165c594adff..d165c594adff 100644
--- a/registry/inc/registry/registry.hxx
+++ b/include/registry/registry.hxx
diff --git a/registry/inc/registry/regtype.h b/include/registry/regtype.h
index 86ddb299fb37..86ddb299fb37 100644
--- a/registry/inc/registry/regtype.h
+++ b/include/registry/regtype.h
diff --git a/registry/inc/registry/types.h b/include/registry/types.h
index 0ad7977486f4..0ad7977486f4 100644
--- a/registry/inc/registry/types.h
+++ b/include/registry/types.h
diff --git a/registry/inc/registry/version.h b/include/registry/version.h
index 01f0f8033323..01f0f8033323 100644
--- a/registry/inc/registry/version.h
+++ b/include/registry/version.h
diff --git a/registry/inc/registry/writer.h b/include/registry/writer.h
index f1b39a583e22..f1b39a583e22 100644
--- a/registry/inc/registry/writer.h
+++ b/include/registry/writer.h
diff --git a/registry/inc/registry/writer.hxx b/include/registry/writer.hxx
index cfdf479853df..cfdf479853df 100644
--- a/registry/inc/registry/writer.hxx
+++ b/include/registry/writer.hxx
diff --git a/rsc/inc/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx
index 4e8ca10090c7..4e8ca10090c7 100644
--- a/rsc/inc/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
diff --git a/rsc/inc/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx
index 8dc9687031d5..8dc9687031d5 100644
--- a/rsc/inc/rsc/rscsfx.hxx
+++ b/include/rsc/rscsfx.hxx
diff --git a/sax/inc/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index f31be4b142f6..f31be4b142f6 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
diff --git a/sax/inc/sax/fshelper.hxx b/include/sax/fshelper.hxx
index e0945fc07ddf..e0945fc07ddf 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
diff --git a/sax/inc/sax/saxdllapi.h b/include/sax/saxdllapi.h
index e4716975bec7..e4716975bec7 100644
--- a/sax/inc/sax/saxdllapi.h
+++ b/include/sax/saxdllapi.h
diff --git a/sax/inc/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index 615308c9e418..615308c9e418 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
diff --git a/sax/inc/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx
index 5867bbbb9cac..5867bbbb9cac 100644
--- a/sax/inc/sax/tools/documenthandleradapter.hxx
+++ b/include/sax/tools/documenthandleradapter.hxx
diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index d81401266ac3..d81401266ac3 100644
--- a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 70737da920ce..70737da920ce 100644
--- a/sfx2/inc/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
diff --git a/sfx2/inc/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx
index e442b482ff53..e442b482ff53 100644
--- a/sfx2/inc/sfx2/QuerySaveDocument.hxx
+++ b/include/sfx2/QuerySaveDocument.hxx
diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index a7540dc469b0..a7540dc469b0 100644
--- a/sfx2/inc/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
diff --git a/sfx2/inc/sfx2/app.hxx b/include/sfx2/app.hxx
index 858140d2b8be..858140d2b8be 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
diff --git a/sfx2/inc/sfx2/appuno.hxx b/include/sfx2/appuno.hxx
index 90bf2d5edf58..90bf2d5edf58 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/include/sfx2/appuno.hxx
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 95278e89e605..95278e89e605 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
diff --git a/sfx2/inc/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 664673cf66d5..664673cf66d5 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index 85cd33402f3c..85cd33402f3c 100644
--- a/sfx2/inc/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
diff --git a/sfx2/inc/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index f8bf451e2b22..f8bf451e2b22 100644
--- a/sfx2/inc/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
diff --git a/sfx2/inc/sfx2/checkin.hxx b/include/sfx2/checkin.hxx
index 9a9c20f485d7..9a9c20f485d7 100644
--- a/sfx2/inc/sfx2/checkin.hxx
+++ b/include/sfx2/checkin.hxx
diff --git a/sfx2/inc/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index d0c5e50fce1f..d0c5e50fce1f 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
diff --git a/sfx2/inc/sfx2/cntids.hrc b/include/sfx2/cntids.hrc
index db4c5877afd6..db4c5877afd6 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/include/sfx2/cntids.hrc
diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 0a429b906638..0a429b906638 100644
--- a/sfx2/inc/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index af6288e772e9..af6288e772e9 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc
index debf4e64c21c..debf4e64c21c 100644
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/include/sfx2/dialogs.hrc
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index c0758b56bc00..c0758b56bc00 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx
index b24908a7d081..b24908a7d081 100644
--- a/sfx2/inc/sfx2/dinfedt.hxx
+++ b/include/sfx2/dinfedt.hxx
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 2b02a5e620c6..2b02a5e620c6 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
diff --git a/sfx2/inc/sfx2/dllapi.h b/include/sfx2/dllapi.h
index 95ba80bff9e5..95ba80bff9e5 100644
--- a/sfx2/inc/sfx2/dllapi.h
+++ b/include/sfx2/dllapi.h
diff --git a/sfx2/inc/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index e8d15a8366cd..e8d15a8366cd 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
diff --git a/sfx2/inc/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index fcf7351f9c9f..fcf7351f9c9f 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index cc6f6b8c1971..cc6f6b8c1971 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
diff --git a/sfx2/inc/sfx2/docinf.hxx b/include/sfx2/docinf.hxx
index 8ab57ffe2ae4..8ab57ffe2ae4 100644
--- a/sfx2/inc/sfx2/docinf.hxx
+++ b/include/sfx2/docinf.hxx
diff --git a/sfx2/inc/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index cefcf034f48e..cefcf034f48e 100644
--- a/sfx2/inc/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index d64b6ed7a6f7..d64b6ed7a6f7 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 4e089d7e3d55..4e089d7e3d55 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index c361b8768260..c361b8768260 100644
--- a/sfx2/inc/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index a5b24cf81993..a5b24cf81993 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
diff --git a/sfx2/inc/sfx2/event.hxx b/include/sfx2/event.hxx
index bcdc88ec2edb..bcdc88ec2edb 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 2f181ad820b1..2f181ad820b1 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index de7d9a961de4..de7d9a961de4 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 304fd5cdff58..304fd5cdff58 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
diff --git a/sfx2/inc/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 63220cae1325..63220cae1325 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 2c0c178a3795..2c0c178a3795 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index d1eb1c4054c0..d1eb1c4054c0 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 3abdfbee3107..3abdfbee3107 100644
--- a/sfx2/inc/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
diff --git a/sfx2/inc/sfx2/genlink.hxx b/include/sfx2/genlink.hxx
index 045047d9d0c7..045047d9d0c7 100644
--- a/sfx2/inc/sfx2/genlink.hxx
+++ b/include/sfx2/genlink.hxx
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index 25adb3ea3d58..25adb3ea3d58 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.hxx
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx
index 0ce8e430869e..0ce8e430869e 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/include/sfx2/htmlmode.hxx
diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx
index 92df8e70c573..92df8e70c573 100644
--- a/sfx2/inc/sfx2/imagemgr.hxx
+++ b/include/sfx2/imagemgr.hxx
diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx
index 7ef278023336..7ef278023336 100644
--- a/sfx2/inc/sfx2/imgmgr.hxx
+++ b/include/sfx2/imgmgr.hxx
diff --git a/sfx2/inc/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index b91d01ad4927..b91d01ad4927 100644
--- a/sfx2/inc/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
diff --git a/sfx2/inc/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index e97b628d4b1a..e97b628d4b1a 100644
--- a/sfx2/inc/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 95a545e3dad4..95a545e3dad4 100644
--- a/sfx2/inc/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 7143fadf092f..7143fadf092f 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 24a5f6315edb..24a5f6315edb 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
diff --git a/sfx2/inc/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index 4ff77b6afa54..4ff77b6afa54 100644
--- a/sfx2/inc/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index ebd76db400d0..ebd76db400d0 100644
--- a/sfx2/inc/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
diff --git a/sfx2/inc/sfx2/macropg.hxx b/include/sfx2/macropg.hxx
index 1a6c87198f41..1a6c87198f41 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/include/sfx2/macropg.hxx
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 042a364e2b5a..042a364e2b5a 100644
--- a/sfx2/inc/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 553c5bd745f3..553c5bd745f3 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
diff --git a/sfx2/inc/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 6b616607b38f..6b616607b38f 100644
--- a/sfx2/inc/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
diff --git a/sfx2/inc/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index fb06ffc1e979..fb06ffc1e979 100644
--- a/sfx2/inc/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index e65220be2a13..e65220be2a13 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx
index 4624026a059e..4624026a059e 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/include/sfx2/mnumgr.hxx
diff --git a/sfx2/inc/sfx2/module.hxx b/include/sfx2/module.hxx
index 3b285faf6593..3b285faf6593 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
diff --git a/sfx2/inc/sfx2/msg.hxx b/include/sfx2/msg.hxx
index eca6618cc118..eca6618cc118 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 500912ff3f5b..500912ff3f5b 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
diff --git a/sfx2/inc/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index b1cada954d2b..b1cada954d2b 100644
--- a/sfx2/inc/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
diff --git a/sfx2/inc/sfx2/new.hxx b/include/sfx2/new.hxx
index a7534580f1cd..a7534580f1cd 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 2c7999f9923c..2c7999f9923c 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
diff --git a/sfx2/inc/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 8e1f772e3791..8e1f772e3791 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
diff --git a/sfx2/inc/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index 8e607c9f0ce5..8e607c9f0ce5 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
diff --git a/sfx2/inc/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4c366a56710f..4c366a56710f 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index 70dce688e9a8..70dce688e9a8 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
diff --git a/sfx2/inc/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 1f10c7416b98..1f10c7416b98 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
diff --git a/sfx2/inc/sfx2/printer.hxx b/include/sfx2/printer.hxx
index aac11a3bf4dc..aac11a3bf4dc 100644
--- a/sfx2/inc/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
diff --git a/sfx2/inc/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 44d37d0a4558..44d37d0a4558 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 0d14c616a7bc..0d14c616a7bc 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
diff --git a/sfx2/inc/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 285360272d30..285360272d30 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index 475d3cd00765..475d3cd00765 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
diff --git a/sfx2/inc/sfx2/request.hxx b/include/sfx2/request.hxx
index 590fd7bffeaf..590fd7bffeaf 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 994fd0befa41..994fd0befa41 100644
--- a/sfx2/inc/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
diff --git a/sfx2/inc/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 245daa2f062a..245daa2f062a 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index df2635f711ed..df2635f711ed 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 524c86b0b99d..524c86b0b99d 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index 3f4df5cb5220..3f4df5cb5220 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.h
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/include/sfx2/sfxdefs.hxx
index cca545f7e2f7..cca545f7e2f7 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/include/sfx2/sfxdefs.hxx
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index a994c7dfa77a..a994c7dfa77a 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 9de00f008736..9de00f008736 100644
--- a/sfx2/inc/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 7569afe483c2..7569afe483c2 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 612aea61d07e..612aea61d07e 100644
--- a/sfx2/inc/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index f90221847579..f90221847579 100644
--- a/sfx2/inc/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 00923ffdc6a8..00923ffdc6a8 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 9e6be020db10..9e6be020db10 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 6b0a2763497e..6b0a2763497e 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
diff --git a/sfx2/inc/sfx2/shell.hxx b/include/sfx2/shell.hxx
index cba6efaf8e36..cba6efaf8e36 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index ff17355d2f48..ff17355d2f48 100644
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
diff --git a/sfx2/inc/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index d94e76841045..d94e76841045 100644
--- a/sfx2/inc/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index b728be448a49..b728be448a49 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index 0580e4cae25c..0580e4cae25c 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/include/sfx2/styledlg.hxx
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 17016489e917..17016489e917 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
diff --git a/sfx2/inc/sfx2/tabpage.hrc b/include/sfx2/tabpage.hrc
index 2c70183d433f..2c70183d433f 100644
--- a/sfx2/inc/sfx2/tabpage.hrc
+++ b/include/sfx2/tabpage.hrc
diff --git a/sfx2/inc/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 0d0dd6eea199..0d0dd6eea199 100644
--- a/sfx2/inc/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 56047d1e32ad..56047d1e32ad 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 5f1eca6a80fa..5f1eca6a80fa 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx
index 527571c80cac..527571c80cac 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/include/sfx2/templatecontaineritem.hxx
diff --git a/sfx2/inc/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index 69d79b20da9a..69d79b20da9a 100644
--- a/sfx2/inc/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 6cefaf1782c0..6cefaf1782c0 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
diff --git a/sfx2/inc/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc
index 7d3c52798461..7d3c52798461 100644
--- a/sfx2/inc/sfx2/templatelocnames.hrc
+++ b/include/sfx2/templatelocnames.hrc
diff --git a/sfx2/inc/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx
index f0db901073f0..f0db901073f0 100644
--- a/sfx2/inc/sfx2/templateproperties.hxx
+++ b/include/sfx2/templateproperties.hxx
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index bcb2b68fc0a4..bcb2b68fc0a4 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
diff --git a/sfx2/inc/sfx2/templaterepository.hxx b/include/sfx2/templaterepository.hxx
index f134c9897bf6..f134c9897bf6 100644
--- a/sfx2/inc/sfx2/templaterepository.hxx
+++ b/include/sfx2/templaterepository.hxx
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx
index efabd34ea4fd..efabd34ea4fd 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/include/sfx2/templateviewitem.hxx
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index e9fb3a5e4c51..e9fb3a5e4c51 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 2bdf1b94ae09..2bdf1b94ae09 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 64a20cda910f..64a20cda910f 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 09b500caa6bc..09b500caa6bc 100644
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
diff --git a/sfx2/inc/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 58f0618443ae..58f0618443ae 100644
--- a/sfx2/inc/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index d1d41b8ae689..d1d41b8ae689 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx
index 7350314b4835..7350314b4835 100644
--- a/sfx2/inc/sfx2/userinputinterception.hxx
+++ b/include/sfx2/userinputinterception.hxx
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 3348cb69d199..3348cb69d199 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 522b4719eac0..522b4719eac0 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index ad4c64cd5272..ad4c64cd5272 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
diff --git a/sfx2/inc/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index ab5c81c425aa..ab5c81c425aa 100644
--- a/sfx2/inc/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
diff --git a/shell/inc/shell/kde_headers.h b/include/shell/kde_headers.h
index 3ca3fa69ef26..3ca3fa69ef26 100644
--- a/shell/inc/shell/kde_headers.h
+++ b/include/shell/kde_headers.h
diff --git a/shell/inc/shell/tde_defines.h b/include/shell/tde_defines.h
index 0dc91e931cee..0dc91e931cee 100644
--- a/shell/inc/shell/tde_defines.h
+++ b/include/shell/tde_defines.h
diff --git a/shell/inc/shell/tde_headers.h b/include/shell/tde_headers.h
index ed3739eb2e43..ed3739eb2e43 100644
--- a/shell/inc/shell/tde_headers.h
+++ b/include/shell/tde_headers.h
diff --git a/sot/inc/sot/exchange.hxx b/include/sot/exchange.hxx
index b4273682de40..b4273682de40 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
diff --git a/sot/inc/sot/factory.hxx b/include/sot/factory.hxx
index 726b24382756..726b24382756 100644
--- a/sot/inc/sot/factory.hxx
+++ b/include/sot/factory.hxx
diff --git a/sot/inc/sot/filelist.hxx b/include/sot/filelist.hxx
index 2e69a95e5498..2e69a95e5498 100644
--- a/sot/inc/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
diff --git a/sot/inc/sot/formats.hxx b/include/sot/formats.hxx
index 912947669e53..912947669e53 100644
--- a/sot/inc/sot/formats.hxx
+++ b/include/sot/formats.hxx
diff --git a/sot/inc/sot/object.hxx b/include/sot/object.hxx
index 435dda8d4626..435dda8d4626 100644
--- a/sot/inc/sot/object.hxx
+++ b/include/sot/object.hxx
diff --git a/sot/inc/sot/sotdata.hxx b/include/sot/sotdata.hxx
index da045079c76e..da045079c76e 100644
--- a/sot/inc/sot/sotdata.hxx
+++ b/include/sot/sotdata.hxx
diff --git a/sot/inc/sot/sotdllapi.h b/include/sot/sotdllapi.h
index 722d2ee25f47..722d2ee25f47 100644
--- a/sot/inc/sot/sotdllapi.h
+++ b/include/sot/sotdllapi.h
diff --git a/sot/inc/sot/stg.hxx b/include/sot/stg.hxx
index bd124cc8df00..bd124cc8df00 100644
--- a/sot/inc/sot/stg.hxx
+++ b/include/sot/stg.hxx
diff --git a/sot/inc/sot/storage.hxx b/include/sot/storage.hxx
index db3995dfc374..db3995dfc374 100644
--- a/sot/inc/sot/storage.hxx
+++ b/include/sot/storage.hxx
diff --git a/sot/inc/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 5518d618bf36..5518d618bf36 100644
--- a/sot/inc/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
diff --git a/store/inc/store/store.h b/include/store/store.h
index ff3f1ef0a390..ff3f1ef0a390 100644
--- a/store/inc/store/store.h
+++ b/include/store/store.h
diff --git a/store/inc/store/store.hxx b/include/store/store.hxx
index 43ef8859c52e..43ef8859c52e 100644
--- a/store/inc/store/store.hxx
+++ b/include/store/store.hxx
diff --git a/store/inc/store/storedllapi.h b/include/store/storedllapi.h
index 0a4b27a333ca..0a4b27a333ca 100644
--- a/store/inc/store/storedllapi.h
+++ b/include/store/storedllapi.h
diff --git a/store/inc/store/types.h b/include/store/types.h
index 0d51995348a0..0d51995348a0 100644
--- a/store/inc/store/types.h
+++ b/include/store/types.h
diff --git a/svl/inc/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx
index 7204ebdc845b..7204ebdc845b 100644
--- a/svl/inc/svl/PasswordHelper.hxx
+++ b/include/svl/PasswordHelper.hxx
diff --git a/svl/inc/svl/adrparse.hxx b/include/svl/adrparse.hxx
index 063ba11a95a9..063ba11a95a9 100644
--- a/svl/inc/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
diff --git a/svl/inc/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 7dd741592015..7dd741592015 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
diff --git a/svl/inc/svl/asiancfg.hxx b/include/svl/asiancfg.hxx
index 622b1f8ff277..622b1f8ff277 100644
--- a/svl/inc/svl/asiancfg.hxx
+++ b/include/svl/asiancfg.hxx
diff --git a/svl/inc/svl/brdcst.hxx b/include/svl/brdcst.hxx
index 258cf6066e58..258cf6066e58 100644
--- a/svl/inc/svl/brdcst.hxx
+++ b/include/svl/brdcst.hxx
diff --git a/svl/inc/svl/broadcast.hxx b/include/svl/broadcast.hxx
index ac2931986914..ac2931986914 100644
--- a/svl/inc/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
diff --git a/svl/inc/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 35024c3a6d44..35024c3a6d44 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
diff --git a/svl/inc/svl/cintitem.hxx b/include/svl/cintitem.hxx
index e781ada09a35..e781ada09a35 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
diff --git a/svl/inc/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx
index 22055e404b42..22055e404b42 100644
--- a/svl/inc/svl/cjkoptions.hxx
+++ b/include/svl/cjkoptions.hxx
diff --git a/svl/inc/svl/cntwall.hxx b/include/svl/cntwall.hxx
index 581c558b2575..581c558b2575 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
diff --git a/svl/inc/svl/cntwids.hrc b/include/svl/cntwids.hrc
index 68a9b3ab3ee5..68a9b3ab3ee5 100644
--- a/svl/inc/svl/cntwids.hrc
+++ b/include/svl/cntwids.hrc
diff --git a/svl/inc/svl/converter.hxx b/include/svl/converter.hxx
index 8f423f786307..8f423f786307 100644
--- a/svl/inc/svl/converter.hxx
+++ b/include/svl/converter.hxx
diff --git a/svl/inc/svl/ctloptions.hxx b/include/svl/ctloptions.hxx
index 525e8e73a795..525e8e73a795 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/include/svl/ctloptions.hxx
diff --git a/svl/inc/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index 1a783bca78d8..1a783bca78d8 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
diff --git a/svl/inc/svl/custritm.hxx b/include/svl/custritm.hxx
index 70948d8fbf43..70948d8fbf43 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
diff --git a/svl/inc/svl/dateitem.hxx b/include/svl/dateitem.hxx
index 043502966ffc..043502966ffc 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/include/svl/dateitem.hxx
diff --git a/svl/inc/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 437b59fbf127..437b59fbf127 100644
--- a/svl/inc/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
diff --git a/svl/inc/svl/eitem.hxx b/include/svl/eitem.hxx
index c9c5e389132f..c9c5e389132f 100644
--- a/svl/inc/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
diff --git a/svl/inc/svl/filenotation.hxx b/include/svl/filenotation.hxx
index 00c2c16ed77c..00c2c16ed77c 100644
--- a/svl/inc/svl/filenotation.hxx
+++ b/include/svl/filenotation.hxx
diff --git a/svl/inc/svl/filerec.hxx b/include/svl/filerec.hxx
index afc5f4632fd7..afc5f4632fd7 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
diff --git a/svl/inc/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 6b0c88ef8f7e..6b0c88ef8f7e 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
diff --git a/svl/inc/svl/folderrestriction.hxx b/include/svl/folderrestriction.hxx
index 4ddb9d4be7bc..4ddb9d4be7bc 100644
--- a/svl/inc/svl/folderrestriction.hxx
+++ b/include/svl/folderrestriction.hxx
diff --git a/svl/inc/svl/fstathelper.hxx b/include/svl/fstathelper.hxx
index 9e69c6ed28ec..9e69c6ed28ec 100644
--- a/svl/inc/svl/fstathelper.hxx
+++ b/include/svl/fstathelper.hxx
diff --git a/svl/inc/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 618791bebb92..618791bebb92 100644
--- a/svl/inc/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
diff --git a/svl/inc/svl/hint.hxx b/include/svl/hint.hxx
index 8f5356ac9a13..8f5356ac9a13 100644
--- a/svl/inc/svl/hint.hxx
+++ b/include/svl/hint.hxx
diff --git a/svl/inc/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 6c04ff239c74..6c04ff239c74 100644
--- a/svl/inc/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
diff --git a/svl/inc/svl/imageitm.hxx b/include/svl/imageitm.hxx
index 0a2e26f80086..0a2e26f80086 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
diff --git a/svl/inc/svl/inethist.hxx b/include/svl/inethist.hxx
index 4ee592faad16..4ee592faad16 100644
--- a/svl/inc/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
diff --git a/svl/inc/svl/inettype.hxx b/include/svl/inettype.hxx
index 48fca19aa5d6..48fca19aa5d6 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/include/svl/inettype.hxx
diff --git a/svl/inc/svl/instrm.hxx b/include/svl/instrm.hxx
index 39c3a8589be9..39c3a8589be9 100644
--- a/svl/inc/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
diff --git a/svl/inc/svl/intitem.hxx b/include/svl/intitem.hxx
index a9cb341aec10..a9cb341aec10 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
diff --git a/svl/inc/svl/isethint.hxx b/include/svl/isethint.hxx
index cd966f5fcc4f..cd966f5fcc4f 100644
--- a/svl/inc/svl/isethint.hxx
+++ b/include/svl/isethint.hxx
diff --git a/svl/inc/svl/itemiter.hxx b/include/svl/itemiter.hxx
index 4dada91a42b7..4dada91a42b7 100644
--- a/svl/inc/svl/itemiter.hxx
+++ b/include/svl/itemiter.hxx
diff --git a/svl/inc/svl/itempool.hxx b/include/svl/itempool.hxx
index ab9ff84d173d..ab9ff84d173d 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
diff --git a/svl/inc/svl/itemprop.hxx b/include/svl/itemprop.hxx
index c1b7ed68b400..c1b7ed68b400 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
diff --git a/svl/inc/svl/itemset.hxx b/include/svl/itemset.hxx
index a38398ac1ce7..a38398ac1ce7 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
diff --git a/svl/inc/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index ef8fb1b4ae5d..ef8fb1b4ae5d 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
diff --git a/svl/inc/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 163c2168c4c0..163c2168c4c0 100644
--- a/svl/inc/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
diff --git a/svl/inc/svl/listener.hxx b/include/svl/listener.hxx
index eeb275e302aa..eeb275e302aa 100644
--- a/svl/inc/svl/listener.hxx
+++ b/include/svl/listener.hxx
diff --git a/svl/inc/svl/listeneriter.hxx b/include/svl/listeneriter.hxx
index 9a621d80e244..9a621d80e244 100644
--- a/svl/inc/svl/listeneriter.hxx
+++ b/include/svl/listeneriter.hxx
diff --git a/svl/inc/svl/lngmisc.hxx b/include/svl/lngmisc.hxx
index c1b4a0160277..c1b4a0160277 100644
--- a/svl/inc/svl/lngmisc.hxx
+++ b/include/svl/lngmisc.hxx
diff --git a/svl/inc/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index b9f62cd78504..b9f62cd78504 100644
--- a/svl/inc/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
diff --git a/svl/inc/svl/lstner.hxx b/include/svl/lstner.hxx
index e54368abb557..e54368abb557 100644
--- a/svl/inc/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
diff --git a/svl/inc/svl/macitem.hxx b/include/svl/macitem.hxx
index 9d73f6a3ded3..9d73f6a3ded3 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
diff --git a/svl/inc/svl/mailenum.hxx b/include/svl/mailenum.hxx
index a01c6bc109ed..a01c6bc109ed 100644
--- a/svl/inc/svl/mailenum.hxx
+++ b/include/svl/mailenum.hxx
diff --git a/svl/inc/svl/memberid.hrc b/include/svl/memberid.hrc
index 4d501b5ae2ab..4d501b5ae2ab 100644
--- a/svl/inc/svl/memberid.hrc
+++ b/include/svl/memberid.hrc
diff --git a/svl/inc/svl/metitem.hxx b/include/svl/metitem.hxx
index 090d95450159..090d95450159 100644
--- a/svl/inc/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
diff --git a/svl/inc/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fdedea036d00..fdedea036d00 100644
--- a/svl/inc/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
diff --git a/svl/inc/svl/nfsymbol.hxx b/include/svl/nfsymbol.hxx
index 0edfc33e112d..0edfc33e112d 100644
--- a/svl/inc/svl/nfsymbol.hxx
+++ b/include/svl/nfsymbol.hxx
diff --git a/svl/inc/svl/nfversi.hxx b/include/svl/nfversi.hxx
index 3e86af078fe4..3e86af078fe4 100644
--- a/svl/inc/svl/nfversi.hxx
+++ b/include/svl/nfversi.hxx
diff --git a/svl/inc/svl/nranges.hxx b/include/svl/nranges.hxx
index 364bf59a44f2..364bf59a44f2 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/include/svl/nranges.hxx
diff --git a/svl/inc/svl/numuno.hxx b/include/svl/numuno.hxx
index 515a73fb26a6..515a73fb26a6 100644
--- a/svl/inc/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
diff --git a/svl/inc/svl/ondemand.hxx b/include/svl/ondemand.hxx
index b3a2c42e11e6..b3a2c42e11e6 100644
--- a/svl/inc/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
diff --git a/svl/inc/svl/outstrm.hxx b/include/svl/outstrm.hxx
index 31899599fc90..31899599fc90 100644
--- a/svl/inc/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
diff --git a/svl/inc/svl/ownlist.hxx b/include/svl/ownlist.hxx
index e4cead159c8b..e4cead159c8b 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
diff --git a/svl/inc/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx
index 5f91d3578f9a..5f91d3578f9a 100644
--- a/svl/inc/svl/pickerhistoryaccess.hxx
+++ b/include/svl/pickerhistoryaccess.hxx
diff --git a/svl/inc/svl/poolcach.hxx b/include/svl/poolcach.hxx
index eaf6ad3deef9..eaf6ad3deef9 100644
--- a/svl/inc/svl/poolcach.hxx
+++ b/include/svl/poolcach.hxx
diff --git a/svl/inc/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 5e041825186a..5e041825186a 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
diff --git a/svl/inc/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 6906e24baaf7..6906e24baaf7 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
diff --git a/svl/inc/svl/rectitem.hxx b/include/svl/rectitem.hxx
index b9f0f950eb63..b9f0f950eb63 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
diff --git a/svl/inc/svl/restrictedpaths.hxx b/include/svl/restrictedpaths.hxx
index 85326a569654..85326a569654 100644
--- a/svl/inc/svl/restrictedpaths.hxx
+++ b/include/svl/restrictedpaths.hxx
diff --git a/svl/inc/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 450e958ec179..450e958ec179 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
diff --git a/svl/inc/svl/sfontitm.hxx b/include/svl/sfontitm.hxx
index f9bcbdc7f917..f9bcbdc7f917 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/include/svl/sfontitm.hxx
diff --git a/svl/inc/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index d2c842d98ebb..d2c842d98ebb 100644
--- a/svl/inc/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
diff --git a/svl/inc/svl/slstitm.hxx b/include/svl/slstitm.hxx
index 90c873119b80..90c873119b80 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
diff --git a/svl/inc/svl/smplhint.hxx b/include/svl/smplhint.hxx
index 5c74a3dc4f6e..5c74a3dc4f6e 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/include/svl/smplhint.hxx
diff --git a/svl/inc/svl/solar.hrc b/include/svl/solar.hrc
index 05d2cedc533a..05d2cedc533a 100644
--- a/svl/inc/svl/solar.hrc
+++ b/include/svl/solar.hrc
diff --git a/svl/inc/svl/srchdefs.hxx b/include/svl/srchdefs.hxx
index f339ebff9273..f339ebff9273 100644
--- a/svl/inc/svl/srchdefs.hxx
+++ b/include/svl/srchdefs.hxx
diff --git a/svl/inc/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 5d4413ea8cab..5d4413ea8cab 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
diff --git a/svl/inc/svl/stritem.hxx b/include/svl/stritem.hxx
index a4109218c79e..a4109218c79e 100644
--- a/svl/inc/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
diff --git a/svl/inc/svl/strmadpt.hxx b/include/svl/strmadpt.hxx
index 167d3696d3a2..167d3696d3a2 100644
--- a/svl/inc/svl/strmadpt.hxx
+++ b/include/svl/strmadpt.hxx
diff --git a/svl/inc/svl/style.hrc b/include/svl/style.hrc
index 352cfe18e2b0..352cfe18e2b0 100644
--- a/svl/inc/svl/style.hrc
+++ b/include/svl/style.hrc
diff --git a/svl/inc/svl/style.hxx b/include/svl/style.hxx
index af58cbc44327..af58cbc44327 100644
--- a/svl/inc/svl/style.hxx
+++ b/include/svl/style.hxx
diff --git a/svl/inc/svl/stylepool.hxx b/include/svl/stylepool.hxx
index deaed2591a83..deaed2591a83 100644
--- a/svl/inc/svl/stylepool.hxx
+++ b/include/svl/stylepool.hxx
diff --git a/svl/inc/svl/stylesheetuser.hxx b/include/svl/stylesheetuser.hxx
index 787263ff4a8e..787263ff4a8e 100644
--- a/svl/inc/svl/stylesheetuser.hxx
+++ b/include/svl/stylesheetuser.hxx
diff --git a/svl/inc/svl/svdde.hxx b/include/svl/svdde.hxx
index c8a08beffbb9..c8a08beffbb9 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
diff --git a/svl/inc/svl/svl.hrc b/include/svl/svl.hrc
index 407fd6783c0f..407fd6783c0f 100644
--- a/svl/inc/svl/svl.hrc
+++ b/include/svl/svl.hrc
diff --git a/svl/inc/svl/svldllapi.h b/include/svl/svldllapi.h
index 5d0feda87469..5d0feda87469 100644
--- a/svl/inc/svl/svldllapi.h
+++ b/include/svl/svldllapi.h
diff --git a/svl/inc/svl/szitem.hxx b/include/svl/szitem.hxx
index 1a576eced6fd..1a576eced6fd 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
diff --git a/svl/inc/svl/undo.hxx b/include/svl/undo.hxx
index f36cd816b607..f36cd816b607 100644
--- a/svl/inc/svl/undo.hxx
+++ b/include/svl/undo.hxx
diff --git a/svl/inc/svl/urihelper.hxx b/include/svl/urihelper.hxx
index 321d9cd2ae0b..321d9cd2ae0b 100644
--- a/svl/inc/svl/urihelper.hxx
+++ b/include/svl/urihelper.hxx
diff --git a/svl/inc/svl/urlbmk.hxx b/include/svl/urlbmk.hxx
index cc04b226d146..cc04b226d146 100644
--- a/svl/inc/svl/urlbmk.hxx
+++ b/include/svl/urlbmk.hxx
diff --git a/svl/inc/svl/urlfilter.hxx b/include/svl/urlfilter.hxx
index abcf0fd07091..abcf0fd07091 100644
--- a/svl/inc/svl/urlfilter.hxx
+++ b/include/svl/urlfilter.hxx
diff --git a/svl/inc/svl/visitem.hxx b/include/svl/visitem.hxx
index adb72d0578e7..adb72d0578e7 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
diff --git a/svl/inc/svl/whiter.hxx b/include/svl/whiter.hxx
index e92383624743..e92383624743 100644
--- a/svl/inc/svl/whiter.hxx
+++ b/include/svl/whiter.hxx
diff --git a/svl/inc/svl/xmlement.hxx b/include/svl/xmlement.hxx
index c6b67d59105b..c6b67d59105b 100644
--- a/svl/inc/svl/xmlement.hxx
+++ b/include/svl/xmlement.hxx
diff --git a/svl/inc/svl/zforlist.hxx b/include/svl/zforlist.hxx
index d5c84235a4f9..d5c84235a4f9 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
diff --git a/svl/inc/svl/zformat.hxx b/include/svl/zformat.hxx
index 20cc4d110c24..20cc4d110c24 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
diff --git a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx
index 6334cb82aac1..6334cb82aac1 100644
--- a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
+++ b/include/svtools/AccessibleBrowseBoxObjType.hxx
diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index 167de92636de..167de92636de 100644
--- a/svtools/inc/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
diff --git a/svtools/inc/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx
index 3033e6473129..3033e6473129 100644
--- a/svtools/inc/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
diff --git a/svtools/inc/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx
index b346f8c25671..b346f8c25671 100644
--- a/svtools/inc/svtools/GraphicExportOptionsDialog.hxx
+++ b/include/svtools/GraphicExportOptionsDialog.hxx
diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index d529442cd738..d529442cd738 100644
--- a/svtools/inc/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/include/svtools/QueryFolderName.hxx
index b3ff30d24b81..b3ff30d24b81 100644
--- a/svtools/inc/svtools/QueryFolderName.hxx
+++ b/include/svtools/QueryFolderName.hxx
diff --git a/svtools/inc/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index f75b8aa87e2a..f75b8aa87e2a 100644
--- a/svtools/inc/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 0b3b473449b7..0b3b473449b7 100644
--- a/svtools/inc/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx
index 4c168143aff9..4c168143aff9 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/include/svtools/accessibilityoptions.hxx
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx
index d30af055c91d..d30af055c91d 100644
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
diff --git a/svtools/inc/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx
index 7b314df4f4bf..7b314df4f4bf 100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/include/svtools/accessibletable.hxx
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx
index 775ac23c8ab2..775ac23c8ab2 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/include/svtools/accessibletableprovider.hxx
diff --git a/svtools/inc/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index d7406235b9a6..d7406235b9a6 100644
--- a/svtools/inc/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
diff --git a/svtools/inc/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index fdfb4ef0f671..fdfb4ef0f671 100644
--- a/svtools/inc/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
diff --git a/svtools/inc/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 9551c1478f6b..9551c1478f6b 100644
--- a/svtools/inc/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
diff --git a/svtools/inc/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx
index 0fdea457d5f5..0fdea457d5f5 100644
--- a/svtools/inc/svtools/bindablecontrolhelper.hxx
+++ b/include/svtools/bindablecontrolhelper.hxx
diff --git a/svtools/inc/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx
index 77884bf2620a..77884bf2620a 100644
--- a/svtools/inc/svtools/borderhelper.hxx
+++ b/include/svtools/borderhelper.hxx
diff --git a/svtools/inc/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 128c57c699c2..128c57c699c2 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
diff --git a/svtools/inc/svtools/brwhead.hxx b/include/svtools/brwhead.hxx
index 6eaa06a5f62b..6eaa06a5f62b 100644
--- a/svtools/inc/svtools/brwhead.hxx
+++ b/include/svtools/brwhead.hxx
diff --git a/svtools/inc/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 2c41ae7ed929..2c41ae7ed929 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
diff --git a/svtools/inc/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx
index 47ff64403dc6..47ff64403dc6 100644
--- a/svtools/inc/svtools/cliplistener.hxx
+++ b/include/svtools/cliplistener.hxx
diff --git a/svtools/inc/svtools/collatorres.hxx b/include/svtools/collatorres.hxx
index d8abf68ccf82..d8abf68ccf82 100644
--- a/svtools/inc/svtools/collatorres.hxx
+++ b/include/svtools/collatorres.hxx
diff --git a/svtools/inc/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx
index 2ea6649bdb8c..2ea6649bdb8c 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/include/svtools/colorcfg.hxx
diff --git a/svtools/inc/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index ce155302865b..ce155302865b 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 258da5dedbfb..258da5dedbfb 100644
--- a/svtools/inc/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
diff --git a/svtools/inc/svtools/controldims.hrc b/include/svtools/controldims.hrc
index 2d01ddc668e1..2d01ddc668e1 100644
--- a/svtools/inc/svtools/controldims.hrc
+++ b/include/svtools/controldims.hrc
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 39e5bb02bcc0..39e5bb02bcc0 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
diff --git a/svtools/inc/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index b90f1b67a532..b90f1b67a532 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
diff --git a/svtools/inc/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx
index afaad3854827..afaad3854827 100644
--- a/svtools/inc/svtools/dialogclosedlistener.hxx
+++ b/include/svtools/dialogclosedlistener.hxx
diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx
index 56d31d4e7161..56d31d4e7161 100644
--- a/svtools/inc/svtools/dialogcontrolling.hxx
+++ b/include/svtools/dialogcontrolling.hxx
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index c9299d363c0a..c9299d363c0a 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
diff --git a/svtools/inc/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx
index 983bf6dae5e8..983bf6dae5e8 100644
--- a/svtools/inc/svtools/editimplementation.hxx
+++ b/include/svtools/editimplementation.hxx
diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx
index 747d0567c213..747d0567c213 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/include/svtools/editsyntaxhighlighter.hxx
diff --git a/svtools/inc/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 4b06a6e9d781..4b06a6e9d781 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
diff --git a/svtools/inc/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index ba948376af9b..ba948376af9b 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
diff --git a/svtools/inc/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 9da80b87f37a..9da80b87f37a 100644
--- a/svtools/inc/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx
index 226e6065d5b0..226e6065d5b0 100644
--- a/svtools/inc/svtools/extcolorcfg.hxx
+++ b/include/svtools/extcolorcfg.hxx
diff --git a/svtools/inc/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx
index 62f5c383579a..62f5c383579a 100644
--- a/svtools/inc/svtools/extensionlistbox.hxx
+++ b/include/svtools/extensionlistbox.hxx
diff --git a/svtools/inc/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx
index 2b8caa9d2da5..2b8caa9d2da5 100644
--- a/svtools/inc/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
diff --git a/svtools/inc/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 5654f004f69c..5654f004f69c 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
diff --git a/svtools/inc/svtools/filedlg2.hrc b/include/svtools/filedlg2.hrc
index 4da7f5e0f894..4da7f5e0f894 100644
--- a/svtools/inc/svtools/filedlg2.hrc
+++ b/include/svtools/filedlg2.hrc
diff --git a/svtools/inc/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx
index 5a9219d48050..5a9219d48050 100644
--- a/svtools/inc/svtools/fileurlbox.hxx
+++ b/include/svtools/fileurlbox.hxx
diff --git a/svtools/inc/svtools/fileview.hxx b/include/svtools/fileview.hxx
index d7cb77a19a47..d7cb77a19a47 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
diff --git a/svtools/inc/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 8486926e53a9..8486926e53a9 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx
index 5221e29aa585..5221e29aa585 100644
--- a/svtools/inc/svtools/fontsubstconfig.hxx
+++ b/include/svtools/fontsubstconfig.hxx
diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 7543788f5afc..7543788f5afc 100644
--- a/svtools/inc/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx
index f01d5428a44f..f01d5428a44f 100644
--- a/svtools/inc/svtools/generictoolboxcontroller.hxx
+++ b/include/svtools/generictoolboxcontroller.hxx
diff --git a/svtools/inc/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 808282255bf5..808282255bf5 100644
--- a/svtools/inc/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
diff --git a/svtools/inc/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 9a3bd8c1d1ff..9a3bd8c1d1ff 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
diff --git a/svtools/inc/svtools/headbar.hxx b/include/svtools/headbar.hxx
index 9be63ce3229d..9be63ce3229d 100644
--- a/svtools/inc/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
diff --git a/svtools/inc/svtools/helpid.hrc b/include/svtools/helpid.hrc
index 0751c5b70cd7..0751c5b70cd7 100644
--- a/svtools/inc/svtools/helpid.hrc
+++ b/include/svtools/helpid.hrc
diff --git a/svtools/inc/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 6004ab4dd77a..6004ab4dd77a 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
diff --git a/svtools/inc/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 62640e2bffe6..62640e2bffe6 100644
--- a/svtools/inc/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
diff --git a/svtools/inc/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 72b48c417aa3..72b48c417aa3 100644
--- a/svtools/inc/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
diff --git a/svtools/inc/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 33c76fed1876..33c76fed1876 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
diff --git a/svtools/inc/svtools/htmltokn.h b/include/svtools/htmltokn.h
index 97e73cb4090a..97e73cb4090a 100644
--- a/svtools/inc/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
diff --git a/svtools/inc/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index 745c50798f1d..745c50798f1d 100644
--- a/svtools/inc/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
diff --git a/svtools/inc/svtools/imagemgr.hrc b/include/svtools/imagemgr.hrc
index 1d86788e69fe..1d86788e69fe 100644
--- a/svtools/inc/svtools/imagemgr.hrc
+++ b/include/svtools/imagemgr.hrc
diff --git a/svtools/inc/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 860190f835a3..860190f835a3 100644
--- a/svtools/inc/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index b8282da72167..b8282da72167 100644
--- a/svtools/inc/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
diff --git a/svtools/inc/svtools/imap.hxx b/include/svtools/imap.hxx
index 790cdebef60f..790cdebef60f 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
diff --git a/svtools/inc/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 057561adad98..057561adad98 100644
--- a/svtools/inc/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
diff --git a/svtools/inc/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index e90902bec0f0..e90902bec0f0 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
diff --git a/svtools/inc/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index b4a0eafdb07d..b4a0eafdb07d 100644
--- a/svtools/inc/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
diff --git a/svtools/inc/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index b7d6ab54288a..b7d6ab54288a 100644
--- a/svtools/inc/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
diff --git a/svtools/inc/svtools/imgdef.hxx b/include/svtools/imgdef.hxx
index e243d9fd4231..e243d9fd4231 100644
--- a/svtools/inc/svtools/imgdef.hxx
+++ b/include/svtools/imgdef.hxx
diff --git a/svtools/inc/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx
index 9e2a54a8ef0b..9e2a54a8ef0b 100644
--- a/svtools/inc/svtools/indexentryres.hxx
+++ b/include/svtools/indexentryres.hxx
diff --git a/svtools/inc/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f28ac2cdedfe..f28ac2cdedfe 100644
--- a/svtools/inc/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
diff --git a/svtools/inc/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index a8e85eaf7647..a8e85eaf7647 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
diff --git a/svtools/inc/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 241f3cd128d2..241f3cd128d2 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
diff --git a/svtools/inc/svtools/itemdel.hxx b/include/svtools/itemdel.hxx
index acb2637e04cb..acb2637e04cb 100644
--- a/svtools/inc/svtools/itemdel.hxx
+++ b/include/svtools/itemdel.hxx
diff --git a/svtools/inc/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 3c5aafc57848..3c5aafc57848 100644
--- a/svtools/inc/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
diff --git a/svtools/inc/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index 2c81cbf43d42..2c81cbf43d42 100644
--- a/svtools/inc/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index fed409f41ec5..fed409f41ec5 100644
--- a/svtools/inc/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
diff --git a/svtools/inc/svtools/langhelp.hxx b/include/svtools/langhelp.hxx
index 1231e6b0e380..1231e6b0e380 100644
--- a/svtools/inc/svtools/langhelp.hxx
+++ b/include/svtools/langhelp.hxx
diff --git a/svtools/inc/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 1ef5875d2948..1ef5875d2948 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
diff --git a/svtools/inc/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx
index 8e80f9462cf2..8e80f9462cf2 100644
--- a/svtools/inc/svtools/localresaccess.hxx
+++ b/include/svtools/localresaccess.hxx
diff --git a/svtools/inc/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 527319c52380..527319c52380 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
diff --git a/svtools/inc/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 85c5b604e689..85c5b604e689 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx
index f2d493be21de..f2d493be21de 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
diff --git a/svtools/inc/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 9011dad9a266..9011dad9a266 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
diff --git a/svtools/inc/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 73e1bdd42c6a..73e1bdd42c6a 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
diff --git a/svtools/inc/svtools/place.hxx b/include/svtools/place.hxx
index f6ca8cd7f7b0..f6ca8cd7f7b0 100644
--- a/svtools/inc/svtools/place.hxx
+++ b/include/svtools/place.hxx
diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index daddbed7e9fd..daddbed7e9fd 100644
--- a/svtools/inc/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx
index ec2719cebd5c..ec2719cebd5c 100644
--- a/svtools/inc/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
diff --git a/svtools/inc/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index e3e70e7750e6..e3e70e7750e6 100644
--- a/svtools/inc/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
diff --git a/svtools/inc/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 9999fdb8846b..9999fdb8846b 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
diff --git a/svtools/inc/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index 993b0998aa0b..993b0998aa0b 100644
--- a/svtools/inc/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
diff --git a/svtools/inc/svtools/roadmap.hxx b/include/svtools/roadmap.hxx
index d36a1a3165bb..d36a1a3165bb 100644
--- a/svtools/inc/svtools/roadmap.hxx
+++ b/include/svtools/roadmap.hxx
diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx
index aae7ebfc5d7b..aae7ebfc5d7b 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx
index cf4e908a696c..cf4e908a696c 100644
--- a/svtools/inc/svtools/rtfkeywd.hxx
+++ b/include/svtools/rtfkeywd.hxx
diff --git a/svtools/inc/svtools/rtfout.hxx b/include/svtools/rtfout.hxx
index 9910d8e8115d..9910d8e8115d 100644
--- a/svtools/inc/svtools/rtfout.hxx
+++ b/include/svtools/rtfout.hxx
diff --git a/svtools/inc/svtools/rtftoken.h b/include/svtools/rtftoken.h
index 9a1e3dff167c..9a1e3dff167c 100644
--- a/svtools/inc/svtools/rtftoken.h
+++ b/include/svtools/rtftoken.h
diff --git a/svtools/inc/svtools/ruler.hxx b/include/svtools/ruler.hxx
index a06109bca6a0..a06109bca6a0 100644
--- a/svtools/inc/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
diff --git a/svtools/inc/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index 9d491cf449bd..9d491cf449bd 100644
--- a/svtools/inc/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
diff --git a/svtools/inc/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 7e3928640dfe..7e3928640dfe 100644
--- a/svtools/inc/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
diff --git a/svtools/inc/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index f9af5b9aa620..f9af5b9aa620 100644
--- a/svtools/inc/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
diff --git a/svtools/inc/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index e5b4026a0ec0..e5b4026a0ec0 100644
--- a/svtools/inc/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
diff --git a/svtools/inc/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx
index cb2d996fb03b..cb2d996fb03b 100644
--- a/svtools/inc/svtools/slidesorterbaropt.hxx
+++ b/include/svtools/slidesorterbaropt.hxx
diff --git a/svtools/inc/svtools/soerr.hxx b/include/svtools/soerr.hxx
index e6d366327744..e6d366327744 100644
--- a/svtools/inc/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
diff --git a/svtools/inc/svtools/sores.hxx b/include/svtools/sores.hxx
index 4264f2197f62..4264f2197f62 100644
--- a/svtools/inc/svtools/sores.hxx
+++ b/include/svtools/sores.hxx
diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index eba45e543525..eba45e543525 100644
--- a/svtools/inc/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
diff --git a/svtools/inc/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx
index 77ca119ab363..77ca119ab363 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/include/svtools/stdctrl.hxx
diff --git a/svtools/inc/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
index 4c968db36842..4c968db36842 100644
--- a/svtools/inc/svtools/stdmenu.hxx
+++ b/include/svtools/stdmenu.hxx
diff --git a/svtools/inc/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index c496b34b1361..c496b34b1361 100644
--- a/svtools/inc/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
diff --git a/svtools/inc/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 14784835fa6b..14784835fa6b 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
diff --git a/svtools/inc/svtools/svmedit.hxx b/include/svtools/svmedit.hxx
index c0672a520824..c0672a520824 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/include/svtools/svmedit.hxx
diff --git a/svtools/inc/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx
index 68b754163e19..68b754163e19 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/include/svtools/svmedit2.hxx
diff --git a/svtools/inc/svtools/svparser.hxx b/include/svtools/svparser.hxx
index bd2ee966469a..bd2ee966469a 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
diff --git a/svtools/inc/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 7bcd0591b2d1..7bcd0591b2d1 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
diff --git a/svtools/inc/svtools/svtdllapi.h b/include/svtools/svtdllapi.h
index d8c01a464f45..d8c01a464f45 100644
--- a/svtools/inc/svtools/svtdllapi.h
+++ b/include/svtools/svtdllapi.h
diff --git a/svtools/inc/svtools/svtools.hrc b/include/svtools/svtools.hrc
index ea04f469df35..ea04f469df35 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
diff --git a/svtools/inc/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index 0340a1bd7c5d..0340a1bd7c5d 100644
--- a/svtools/inc/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
diff --git a/svtools/inc/svtools/svxbox.hxx b/include/svtools/svxbox.hxx
index 4ccc566fd74d..4ccc566fd74d 100644
--- a/svtools/inc/svtools/svxbox.hxx
+++ b/include/svtools/svxbox.hxx
diff --git a/svtools/inc/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 265723ecf8b8..265723ecf8b8 100644
--- a/svtools/inc/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx
index 021b523f1bda..021b523f1bda 100644
--- a/svtools/inc/svtools/table/defaultinputhandler.hxx
+++ b/include/svtools/table/defaultinputhandler.hxx
diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx
index 21a096268fe1..21a096268fe1 100644
--- a/svtools/inc/svtools/table/gridtablerenderer.hxx
+++ b/include/svtools/table/gridtablerenderer.hxx
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx
index a170a38a4648..a170a38a4648 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/include/svtools/table/tablecontrol.hxx
diff --git a/svtools/inc/svtools/table/tablecontrolinterface.hxx b/include/svtools/table/tablecontrolinterface.hxx
index a95cc282985c..a95cc282985c 100644
--- a/svtools/inc/svtools/table/tablecontrolinterface.hxx
+++ b/include/svtools/table/tablecontrolinterface.hxx
diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx
index 2158d573bb2d..2158d573bb2d 100644
--- a/svtools/inc/svtools/table/tableinputhandler.hxx
+++ b/include/svtools/table/tableinputhandler.hxx
diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx
index cae54efb0ef0..cae54efb0ef0 100644
--- a/svtools/inc/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx
index 05ee87571c4c..05ee87571c4c 100644
--- a/svtools/inc/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
diff --git a/svtools/inc/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx
index 072e088cb3ee..072e088cb3ee 100644
--- a/svtools/inc/svtools/table/tablesort.hxx
+++ b/include/svtools/table/tablesort.hxx
diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx
index f0333a9a49d7..f0333a9a49d7 100644
--- a/svtools/inc/svtools/table/tabletypes.hxx
+++ b/include/svtools/table/tabletypes.hxx
diff --git a/svtools/inc/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx
index 9000c3e8d7db..9000c3e8d7db 100644
--- a/svtools/inc/svtools/templatefoldercache.hxx
+++ b/include/svtools/templatefoldercache.hxx
diff --git a/svtools/inc/svtools/templdlg.hxx b/include/svtools/templdlg.hxx
index d8eeaa884845..d8eeaa884845 100644
--- a/svtools/inc/svtools/templdlg.hxx
+++ b/include/svtools/templdlg.hxx
diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/include/svtools/textwindowpeer.hxx
index 21de95eaa89c..21de95eaa89c 100644
--- a/svtools/inc/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 247483440947..247483440947 100644
--- a/svtools/inc/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 6bccf935be9c..6bccf935be9c 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx
index 08022018ed38..08022018ed38 100644
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ b/include/svtools/toolpanel/decklayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx
index 0ee0560a8873..0ee0560a8873 100644
--- a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
+++ b/include/svtools/toolpanel/drawerlayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx
index 0b534f88ed9b..0b534f88ed9b 100644
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ b/include/svtools/toolpanel/paneltabbar.hxx
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx
index 18f86edbfbab..18f86edbfbab 100644
--- a/svtools/inc/svtools/toolpanel/refbase.hxx
+++ b/include/svtools/toolpanel/refbase.hxx
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/include/svtools/toolpanel/tabalignment.hxx
index e626d03dc267..e626d03dc267 100644
--- a/svtools/inc/svtools/toolpanel/tabalignment.hxx
+++ b/include/svtools/toolpanel/tabalignment.hxx
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/include/svtools/toolpanel/tabitemcontent.hxx
index 07c7eeedc9fd..07c7eeedc9fd 100644
--- a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
+++ b/include/svtools/toolpanel/tabitemcontent.hxx
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx
index cf76879a4566..cf76879a4566 100644
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ b/include/svtools/toolpanel/tablayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx
index 4c2d0f736ba0..4c2d0f736ba0 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/include/svtools/toolpanel/toolpanel.hxx
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx
index d293aca8d017..d293aca8d017 100644
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ b/include/svtools/toolpanel/toolpaneldeck.hxx
diff --git a/svtools/inc/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx
index 9ca4f6fe239a..9ca4f6fe239a 100644
--- a/svtools/inc/svtools/toolpanelopt.hxx
+++ b/include/svtools/toolpanelopt.hxx
diff --git a/svtools/inc/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 5d63d166bfa5..5d63d166bfa5 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
diff --git a/svtools/inc/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 220b2f4c7f88..220b2f4c7f88 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
diff --git a/svtools/inc/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 180050560bf9..180050560bf9 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
diff --git a/svtools/inc/svtools/treelistentries.hxx b/include/svtools/treelistentries.hxx
index d52d09aac107..d52d09aac107 100755
--- a/svtools/inc/svtools/treelistentries.hxx
+++ b/include/svtools/treelistentries.hxx
diff --git a/svtools/inc/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx
index dfea2651eb0e..dfea2651eb0e 100644
--- a/svtools/inc/svtools/treelistentry.hxx
+++ b/include/svtools/treelistentry.hxx
diff --git a/svtools/inc/svtools/unitconv.hxx b/include/svtools/unitconv.hxx
index 637f575eb9ee..637f575eb9ee 100644
--- a/svtools/inc/svtools/unitconv.hxx
+++ b/include/svtools/unitconv.hxx
diff --git a/svtools/inc/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 581df582a64e..581df582a64e 100644
--- a/svtools/inc/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
diff --git a/svtools/inc/svtools/unoimap.hxx b/include/svtools/unoimap.hxx
index 03fd3ea3e84b..03fd3ea3e84b 100644
--- a/svtools/inc/svtools/unoimap.hxx
+++ b/include/svtools/unoimap.hxx
diff --git a/svtools/inc/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
index 682573855000..682573855000 100644
--- a/svtools/inc/svtools/urlcontrol.hxx
+++ b/include/svtools/urlcontrol.hxx
diff --git a/svtools/inc/svtools/valueset.hxx b/include/svtools/valueset.hxx
index ff032fd3baa4..ff032fd3baa4 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/include/svtools/viewdataentry.hxx
index 3800b293fd2b..3800b293fd2b 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/include/svtools/viewdataentry.hxx
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 8283b131007d..8283b131007d 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
diff --git a/svtools/inc/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index f161b7339ff7..f161b7339ff7 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index fd7a8cd40ff9..fd7a8cd40ff9 100644
--- a/svtools/inc/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 54cdd7719c99..54cdd7719c99 100644
--- a/svx/inc/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index cfe87332fe38..cfe87332fe38 100644
--- a/svx/inc/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 1c3fe797ed59..1c3fe797ed59 100644
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
diff --git a/svx/inc/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 450b090f7562..450b090f7562 100644
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index c7ef007c9d65..c7ef007c9d65 100644
--- a/svx/inc/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index da234960977e..da234960977e 100644
--- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx
index fe239cf271c7..fe239cf271c7 100644
--- a/svx/inc/svx/AccessibleTableShape.hxx
+++ b/include/svx/AccessibleTableShape.hxx
diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index c930af0cb2e4..c930af0cb2e4 100644
--- a/svx/inc/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx
index ce616409922e..ce616409922e 100644
--- a/svx/inc/svx/ActionDescriptionProvider.hxx
+++ b/include/svx/ActionDescriptionProvider.hxx
diff --git a/svx/inc/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 6f05fe95426a..6f05fe95426a 100644
--- a/svx/inc/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index fce8478719c9..fce8478719c9 100644
--- a/svx/inc/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 600e247db6b5..600e247db6b5 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 28df983df61c..28df983df61c 100644
--- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index 4669e68ca137..4669e68ca137 100644
--- a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx
index 6be004105956..6be004105956 100644
--- a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
+++ b/include/svx/EnhancedCustomShapeTypeNames.hxx
diff --git a/svx/inc/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index 05854b66e3b8..05854b66e3b8 100644
--- a/svx/inc/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index 60883e754ee3..60883e754ee3 100644
--- a/svx/inc/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx
index 8a9a061bfb5e..8a9a061bfb5e 100644
--- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx
+++ b/include/svx/IAccessibleViewForwarderListener.hxx
diff --git a/svx/inc/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index 55934efcc545..55934efcc545 100644
--- a/svx/inc/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index 4dea0232bc90..4dea0232bc90 100644
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx
index 59a7c59168e3..59a7c59168e3 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/include/svx/SmartTagCtl.hxx
diff --git a/svx/inc/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 8b4364b979a8..8b4364b979a8 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
diff --git a/svx/inc/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index 836ff820650f..836ff820650f 100644
--- a/svx/inc/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx
index 669c5d193dfa..669c5d193dfa 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/include/svx/SpellDialogChildWindow.hxx
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx
index 4821603938ed..4821603938ed 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/include/svx/SvxShapeTypes.hxx
diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx
index be9d7788bbc1..be9d7788bbc1 100644
--- a/svx/inc/svx/UnoNamespaceMap.hxx
+++ b/include/svx/UnoNamespaceMap.hxx
diff --git a/svx/inc/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx
index 0722434963f9..0722434963f9 100644
--- a/svx/inc/svx/XPropertyTable.hxx
+++ b/include/svx/XPropertyTable.hxx
diff --git a/svx/inc/svx/algitem.hxx b/include/svx/algitem.hxx
index 00a554d6e5f9..00a554d6e5f9 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
diff --git a/svx/inc/svx/anchorid.hxx b/include/svx/anchorid.hxx
index f532b34b3fb2..f532b34b3fb2 100644
--- a/svx/inc/svx/anchorid.hxx
+++ b/include/svx/anchorid.hxx
diff --git a/svx/inc/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 247beaafc7d2..247beaafc7d2 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
diff --git a/svx/inc/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 96a5526b4501..96a5526b4501 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
diff --git a/svx/inc/svx/charmap.hxx b/include/svx/charmap.hxx
index 8f1ff765f78d..8f1ff765f78d 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
diff --git a/svx/inc/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 3b43c4bb7f10..3b43c4bb7f10 100644
--- a/svx/inc/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
diff --git a/svx/inc/svx/checklbx.hxx b/include/svx/checklbx.hxx
index 8a9b3558d272..8a9b3558d272 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
diff --git a/svx/inc/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 92045aa37c77..92045aa37c77 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
diff --git a/svx/inc/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 465436367fad..465436367fad 100644
--- a/svx/inc/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
diff --git a/svx/inc/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 2debc5e0747d..2debc5e0747d 100644
--- a/svx/inc/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
diff --git a/svx/inc/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index ee3451bc857c..ee3451bc857c 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
diff --git a/svx/inc/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index a733fa2b6298..a733fa2b6298 100644
--- a/svx/inc/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
diff --git a/svx/inc/svx/connctrl.hxx b/include/svx/connctrl.hxx
index a559f615c14c..a559f615c14c 100644
--- a/svx/inc/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
diff --git a/svx/inc/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 2ba38f1e9e31..2ba38f1e9e31 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
diff --git a/svx/inc/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c88b74238ae9..c88b74238ae9 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
diff --git a/svx/inc/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 5d65cc5ad8ea..5d65cc5ad8ea 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index 67ecb5165805..67ecb5165805 100644
--- a/svx/inc/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
diff --git a/svx/inc/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index 6acb2194a810..6acb2194a810 100644
--- a/svx/inc/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
diff --git a/svx/inc/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx
index c3efaa524359..c3efaa524359 100644
--- a/svx/inc/svx/databaseregistrationui.hxx
+++ b/include/svx/databaseregistrationui.hxx
diff --git a/svx/inc/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index f4f40673d87b..f4f40673d87b 100644
--- a/svx/inc/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
diff --git a/svx/inc/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 9be3bfbf0da2..9be3bfbf0da2 100644
--- a/svx/inc/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
index 318d35a54f69..318d35a54f69 100644
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/include/svx/dbcharsethelper.hxx
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index c1afd4690509..c1afd4690509 100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
diff --git a/svx/inc/svx/def3d.hxx b/include/svx/def3d.hxx
index 565f396a6d3b..565f396a6d3b 100644
--- a/svx/inc/svx/def3d.hxx
+++ b/include/svx/def3d.hxx
diff --git a/svx/inc/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index a5db1345fc05..a5db1345fc05 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
diff --git a/svx/inc/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index fbb4d271679d..fbb4d271679d 100644
--- a/svx/inc/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
diff --git a/svx/inc/svx/dialmgr.hxx b/include/svx/dialmgr.hxx
index ba2941da2298..ba2941da2298 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/include/svx/dialmgr.hxx
diff --git a/svx/inc/svx/dialogs.hrc b/include/svx/dialogs.hrc
index d41157c46877..d41157c46877 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
diff --git a/svx/inc/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index cc45a444c99c..cc45a444c99c 100644
--- a/svx/inc/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
diff --git a/svx/inc/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 7297bd559bb5..7297bd559bb5 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
diff --git a/svx/inc/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 238a90dd121a..238a90dd121a 100644
--- a/svx/inc/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
diff --git a/svx/inc/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 16447dce67cc..16447dce67cc 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
diff --git a/svx/inc/svx/dstribut_enum.hxx b/include/svx/dstribut_enum.hxx
index 58d798311d3f..58d798311d3f 100644
--- a/svx/inc/svx/dstribut_enum.hxx
+++ b/include/svx/dstribut_enum.hxx
diff --git a/svx/inc/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index dfd722cd8347..dfd722cd8347 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index a0223fbf9ed4..a0223fbf9ed4 100644
--- a/svx/inc/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
diff --git a/svx/inc/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 468a7ad77ca0..468a7ad77ca0 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
diff --git a/svx/inc/svx/extedit.hxx b/include/svx/extedit.hxx
index 6f3c44afcbb0..6f3c44afcbb0 100644
--- a/svx/inc/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
diff --git a/svx/inc/svx/exthelpid.hrc b/include/svx/exthelpid.hrc
index b89d2f5b9fa1..b89d2f5b9fa1 100644
--- a/svx/inc/svx/exthelpid.hrc
+++ b/include/svx/exthelpid.hrc
diff --git a/svx/inc/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 60da90841abb..60da90841abb 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
diff --git a/svx/inc/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 0cb9e829db45..0cb9e829db45 100644
--- a/svx/inc/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/include/svx/extrusioncolorcontrol.hxx
index 1c2538832788..1c2538832788 100644
--- a/svx/inc/svx/extrusioncolorcontrol.hxx
+++ b/include/svx/extrusioncolorcontrol.hxx
diff --git a/svx/inc/svx/f3dchild.hxx b/include/svx/f3dchild.hxx
index 8b0446d1cd83..8b0446d1cd83 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/include/svx/f3dchild.hxx
diff --git a/svx/inc/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 065321f51a64..065321f51a64 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
diff --git a/svx/inc/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index 0b2ea7a6aa70..0b2ea7a6aa70 100644
--- a/svx/inc/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
diff --git a/svx/inc/svx/float3d.hxx b/include/svx/float3d.hxx
index 1809e715c3ad..1809e715c3ad 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
diff --git a/svx/inc/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
index b59eb65c7f59..b59eb65c7f59 100644
--- a/svx/inc/svx/fmdmod.hxx
+++ b/include/svx/fmdmod.hxx
diff --git a/svx/inc/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 50b99f8116a6..50b99f8116a6 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
diff --git a/svx/inc/svx/fmglob.hxx b/include/svx/fmglob.hxx
index 71909d43e8a9..71909d43e8a9 100644
--- a/svx/inc/svx/fmglob.hxx
+++ b/include/svx/fmglob.hxx
diff --git a/svx/inc/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index b0d225ccef24..b0d225ccef24 100644
--- a/svx/inc/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
diff --git a/svx/inc/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 7a1951d4dea0..7a1951d4dea0 100644
--- a/svx/inc/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
diff --git a/svx/inc/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 980f2a58e3d8..980f2a58e3d8 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
diff --git a/svx/inc/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx
index 1686f891f357..1686f891f357 100644
--- a/svx/inc/svx/fmobjfac.hxx
+++ b/include/svx/fmobjfac.hxx
diff --git a/svx/inc/svx/fmpage.hxx b/include/svx/fmpage.hxx
index ba3bdd13679d..ba3bdd13679d 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
diff --git a/svx/inc/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 73cf4c043e7a..73cf4c043e7a 100644
--- a/svx/inc/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
diff --git a/svx/inc/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 2cd75167ea05..2cd75167ea05 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
diff --git a/svx/inc/svx/fmshell.hxx b/include/svx/fmshell.hxx
index c6091aa4ba24..c6091aa4ba24 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
diff --git a/svx/inc/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx
index 8ad3d2edc569..8ad3d2edc569 100644
--- a/svx/inc/svx/fmsrccfg.hxx
+++ b/include/svx/fmsrccfg.hxx
diff --git a/svx/inc/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 6fc1a2aeaa4e..6fc1a2aeaa4e 100644
--- a/svx/inc/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
diff --git a/svx/inc/svx/fmtools.hxx b/include/svx/fmtools.hxx
index bd24488c73a8..bd24488c73a8 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
diff --git a/svx/inc/svx/fmview.hxx b/include/svx/fmview.hxx
index 07ce4c02c106..07ce4c02c106 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
diff --git a/svx/inc/svx/fntctl.hxx b/include/svx/fntctl.hxx
index 08f9f798b066..08f9f798b066 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/include/svx/fntctl.hxx
diff --git a/svx/inc/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index cd8449117d76..cd8449117d76 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
diff --git a/svx/inc/svx/fntszctl.hxx b/include/svx/fntszctl.hxx
index 117553e8e07b..117553e8e07b 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/include/svx/fntszctl.hxx
diff --git a/svx/inc/svx/fontlb.hxx b/include/svx/fontlb.hxx
index b45ed086efd0..b45ed086efd0 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
diff --git a/svx/inc/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 4d2c4a0f6558..4d2c4a0f6558 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
diff --git a/svx/inc/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 8b7d04ef8c3a..8b7d04ef8c3a 100644
--- a/svx/inc/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
diff --git a/svx/inc/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 34f1bafabcb9..34f1bafabcb9 100644
--- a/svx/inc/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index e77a12f00ef4..e77a12f00ef4 100644
--- a/svx/inc/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
diff --git a/svx/inc/svx/framebordertype.hxx b/include/svx/framebordertype.hxx
index 18db6b901c0a..18db6b901c0a 100644
--- a/svx/inc/svx/framebordertype.hxx
+++ b/include/svx/framebordertype.hxx
diff --git a/svx/inc/svx/framelink.hxx b/include/svx/framelink.hxx
index a8a05076f471..a8a05076f471 100644
--- a/svx/inc/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
diff --git a/svx/inc/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index b0afbd4b4b30..b0afbd4b4b30 100644
--- a/svx/inc/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
diff --git a/svx/inc/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 1248e63558a5..1248e63558a5 100644
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
diff --git a/svx/inc/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 48b720856c86..48b720856c86 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
diff --git a/svx/inc/svx/galbrws.hxx b/include/svx/galbrws.hxx
index 0269643c658b..0269643c658b 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/include/svx/galbrws.hxx
diff --git a/svx/inc/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 782163aa95fd..782163aa95fd 100644
--- a/svx/inc/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
diff --git a/svx/inc/svx/gallery.hxx b/include/svx/gallery.hxx
index a2b010b9f4f0..a2b010b9f4f0 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
diff --git a/svx/inc/svx/gallery1.hxx b/include/svx/gallery1.hxx
index e116c14b8cf6..e116c14b8cf6 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
diff --git a/svx/inc/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 16f84cbe907b..16f84cbe907b 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
diff --git a/svx/inc/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 0326418e8e6a..0326418e8e6a 100644
--- a/svx/inc/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
diff --git a/svx/inc/svx/globl3d.hxx b/include/svx/globl3d.hxx
index d5d495153a7b..d5d495153a7b 100644
--- a/svx/inc/svx/globl3d.hxx
+++ b/include/svx/globl3d.hxx
diff --git a/svx/inc/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index 10b050990d62..10b050990d62 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
diff --git a/svx/inc/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 1d91aa3ddd7e..1d91aa3ddd7e 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
diff --git a/svx/inc/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index 650a300b6da6..650a300b6da6 100644
--- a/svx/inc/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
diff --git a/svx/inc/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 06836b2827cd..06836b2827cd 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
diff --git a/svx/inc/svx/grfflt.hxx b/include/svx/grfflt.hxx
index 8557c121c648..8557c121c648 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
diff --git a/svx/inc/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 9a146353950d..9a146353950d 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
diff --git a/svx/inc/svx/hdft.hxx b/include/svx/hdft.hxx
index bb1d2f507d3d..bb1d2f507d3d 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
diff --git a/svx/inc/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index 1c9ecd417732..1c9ecd417732 100644
--- a/svx/inc/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
diff --git a/svx/inc/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index d1bdcfe5aa71..d1bdcfe5aa71 100644
--- a/svx/inc/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
diff --git a/svx/inc/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx
index b7215ce1b732..b7215ce1b732 100644
--- a/svx/inc/svx/hyperdlg.hxx
+++ b/include/svx/hyperdlg.hxx
diff --git a/svx/inc/svx/ifaceids.hxx b/include/svx/ifaceids.hxx
index 20ab313de5e1..20ab313de5e1 100644
--- a/svx/inc/svx/ifaceids.hxx
+++ b/include/svx/ifaceids.hxx
diff --git a/svx/inc/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 9afd8b01a6fa..9afd8b01a6fa 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
diff --git a/svx/inc/svx/insctrl.hxx b/include/svx/insctrl.hxx
index 9fbcd4e0e490..9fbcd4e0e490 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index 870ebce0b922..870ebce0b922 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
diff --git a/svx/inc/svx/itemwin.hxx b/include/svx/itemwin.hxx
index d2a1b25997e0..d2a1b25997e0 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
diff --git a/svx/inc/svx/itextprovider.hxx b/include/svx/itextprovider.hxx
index 3202e4d65495..3202e4d65495 100644
--- a/svx/inc/svx/itextprovider.hxx
+++ b/include/svx/itextprovider.hxx
diff --git a/svx/inc/svx/langbox.hxx b/include/svx/langbox.hxx
index 106af28ee913..106af28ee913 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
diff --git a/svx/inc/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index c43c4265bb2c..c43c4265bb2c 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
diff --git a/svx/inc/svx/layctrl.hxx b/include/svx/layctrl.hxx
index b32c2a514adc..b32c2a514adc 100644
--- a/svx/inc/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
diff --git a/svx/inc/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 2c449b0db745..2c449b0db745 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
diff --git a/svx/inc/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 4d09d55183a4..4d09d55183a4 100644
--- a/svx/inc/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
diff --git a/svx/inc/svx/linkwarn.hxx b/include/svx/linkwarn.hxx
index 67d41adb6384..67d41adb6384 100644
--- a/svx/inc/svx/linkwarn.hxx
+++ b/include/svx/linkwarn.hxx
diff --git a/svx/inc/svx/measctrl.hxx b/include/svx/measctrl.hxx
index dfd1ff7202de..dfd1ff7202de 100644
--- a/svx/inc/svx/measctrl.hxx
+++ b/include/svx/measctrl.hxx
diff --git a/svx/inc/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 89ea37eefef3..89ea37eefef3 100644
--- a/svx/inc/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
diff --git a/svx/inc/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 3ff5a3dbebe8..3ff5a3dbebe8 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
diff --git a/svx/inc/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 2a8607c13b42..2a8607c13b42 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
diff --git a/svx/inc/svx/numinf.hxx b/include/svx/numinf.hxx
index f6cd721e8cd9..f6cd721e8cd9 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
diff --git a/svx/inc/svx/numvset.hxx b/include/svx/numvset.hxx
index 264f1ffa2459..264f1ffa2459 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
diff --git a/svx/inc/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 1074fbccb256..1074fbccb256 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
diff --git a/svx/inc/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index 6f8c67288e1f..6f8c67288e1f 100644
--- a/svx/inc/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
diff --git a/svx/inc/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 61a0bb38950a..61a0bb38950a 100644
--- a/svx/inc/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
diff --git a/svx/inc/svx/optgenrl.hxx b/include/svx/optgenrl.hxx
index 54df8e21dbf2..54df8e21dbf2 100644
--- a/svx/inc/svx/optgenrl.hxx
+++ b/include/svx/optgenrl.hxx
diff --git a/svx/inc/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 300dfaabcd4a..300dfaabcd4a 100644
--- a/svx/inc/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
diff --git a/svx/inc/svx/orienthelper.hxx b/include/svx/orienthelper.hxx
index c012f1e4d8d0..c012f1e4d8d0 100644
--- a/svx/inc/svx/orienthelper.hxx
+++ b/include/svx/orienthelper.hxx
diff --git a/svx/inc/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 9a6e2ca90821..9a6e2ca90821 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
diff --git a/svx/inc/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 48d5dd98f04d..48d5dd98f04d 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
diff --git a/svx/inc/svx/paraprev.hxx b/include/svx/paraprev.hxx
index ebef6399fcac..ebef6399fcac 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
diff --git a/svx/inc/svx/passwd.hxx b/include/svx/passwd.hxx
index b59898db66f7..b59898db66f7 100644
--- a/svx/inc/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
diff --git a/svx/inc/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx
index e472349a6c53..e472349a6c53 100644
--- a/svx/inc/svx/pfiledlg.hxx
+++ b/include/svx/pfiledlg.hxx
diff --git a/svx/inc/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 843eac5c288a..843eac5c288a 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
diff --git a/svx/inc/svx/polypolygoneditor.hxx b/include/svx/polypolygoneditor.hxx
index 94fabbe4e292..94fabbe4e292 100644
--- a/svx/inc/svx/polypolygoneditor.hxx
+++ b/include/svx/polypolygoneditor.hxx
diff --git a/svx/inc/svx/polysc3d.hxx b/include/svx/polysc3d.hxx
index e25a0bdb36b1..e25a0bdb36b1 100644
--- a/svx/inc/svx/polysc3d.hxx
+++ b/include/svx/polysc3d.hxx
diff --git a/svx/inc/svx/postattr.hxx b/include/svx/postattr.hxx
index 9bdd2698551e..9bdd2698551e 100644
--- a/svx/inc/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
diff --git a/svx/inc/svx/prtqry.hxx b/include/svx/prtqry.hxx
index 558301a3c978..558301a3c978 100644
--- a/svx/inc/svx/prtqry.hxx
+++ b/include/svx/prtqry.hxx
diff --git a/svx/inc/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index a4280844099c..a4280844099c 100644
--- a/svx/inc/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
diff --git a/svx/inc/svx/rectenum.hxx b/include/svx/rectenum.hxx
index 4e6c5486f2b6..4e6c5486f2b6 100644
--- a/svx/inc/svx/rectenum.hxx
+++ b/include/svx/rectenum.hxx
diff --git a/svx/inc/svx/relfld.hxx b/include/svx/relfld.hxx
index fa544c2d00a5..fa544c2d00a5 100644
--- a/svx/inc/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
diff --git a/svx/inc/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index f945280fc2b2..f945280fc2b2 100644
--- a/svx/inc/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
diff --git a/svx/inc/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index f1538a32c3ec..f1538a32c3ec 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
diff --git a/svx/inc/svx/ruler.hxx b/include/svx/ruler.hxx
index aa18893ec3cc..aa18893ec3cc 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
diff --git a/svx/inc/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 545edb4cda85..545edb4cda85 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
diff --git a/svx/inc/svx/scene3d.hxx b/include/svx/scene3d.hxx
index c2e9f7776b83..c2e9f7776b83 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
diff --git a/svx/inc/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 1b5435067332..1b5435067332 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
diff --git a/svx/inc/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 67e97fb0c454..67e97fb0c454 100644
--- a/svx/inc/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
diff --git a/svx/inc/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index e54bf1f654e2..e54bf1f654e2 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
diff --git a/svx/inc/svx/sderitm.hxx b/include/svx/sderitm.hxx
index 61751bd3cad2..61751bd3cad2 100644
--- a/svx/inc/svx/sderitm.hxx
+++ b/include/svx/sderitm.hxx
diff --git a/svx/inc/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
index 186c764d3d1b..186c764d3d1b 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/include/svx/sdgcoitm.hxx
diff --git a/svx/inc/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index 48eea4733624..48eea4733624 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
diff --git a/svx/inc/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx
index d7c44fe0918e..d7c44fe0918e 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/include/svx/sdggaitm.hxx
diff --git a/svx/inc/svx/sdginitm.hxx b/include/svx/sdginitm.hxx
index 5b17ddef807d..5b17ddef807d 100644
--- a/svx/inc/svx/sdginitm.hxx
+++ b/include/svx/sdginitm.hxx
diff --git a/svx/inc/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx
index 2f2b21a83842..2f2b21a83842 100644
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/include/svx/sdgluitm.hxx
diff --git a/svx/inc/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index b97178357244..b97178357244 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
diff --git a/svx/inc/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index f09d5abbcba0..f09d5abbcba0 100644
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
diff --git a/svx/inc/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 9045dc91916d..9045dc91916d 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
diff --git a/svx/inc/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index ff6a1f9b0bfa..ff6a1f9b0bfa 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
diff --git a/svx/inc/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index 7e01de417185..7e01de417185 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 39fcf8ae04f1..39fcf8ae04f1 100644
--- a/svx/inc/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx
index 0c59afee92f5..0c59afee92f5 100644
--- a/svx/inc/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index a2681b740eb1..a2681b740eb1 100644
--- a/svx/inc/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx
index f64bac542a76..f64bac542a76 100644
--- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrfilltextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx
index 5a406376dccd..5a406376dccd 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
index 139fb0fd045e..139fb0fd045e 100644
--- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
index 20c853915737..20c853915737 100644
--- a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
index 4a82d683ec26..4a82d683ec26 100644
--- a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
index 0b82edc12241..0b82edc12241 100644
--- a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx
index ac85aebc8d46..ac85aebc8d46 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrtextattribute.hxx
diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 6c4b85e6f989..6c4b85e6f989 100644
--- a/svx/inc/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index fb67a18803fd..fb67a18803fd 100644
--- a/svx/inc/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 9c4a0bff1763..9c4a0bff1763 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx
index 06371bf35b81..06371bf35b81 100644
--- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/include/svx/sdr/contact/objectcontactofpageview.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 8e136e03afba..8e136e03afba 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
index 02bdb36e53c0..02bdb36e53c0 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3d.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx
index 8207fa558db0..8207fa558db0 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
index 53d6b17913d2..53d6b17913d2 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
index ad57b5588195..ad57b5588195 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 295d1c308697..295d1c308697 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index bd5879fc0b9d..bd5879fc0b9d 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
index dd245d7efa06..dd245d7efa06 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx
index 303ff79bd180..303ff79bd180 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx
+++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx
index eb1c4a2517ce..eb1c4a2517ce 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx
+++ b/include/svx/sdr/contact/viewcontactofgroup.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index fc2df17d9e0a..fc2df17d9e0a 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index 30a53e5eb9ac..30a53e5eb9ac 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 19cc9976dbdf..19cc9976dbdf 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
index 27059b275437..27059b275437 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
index 0ca7d4101b7b..0ca7d4101b7b 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 83a32a17a9ec..83a32a17a9ec 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 3ad8580cf12e..3ad8580cf12e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index b628637cb707..b628637cb707 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 8b4e06100a0c..8b4e06100a0c 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index fb97f3e49884..fb97f3e49884 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
index b194108541ac..b194108541ac 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
index 19ef798b8aaf..19ef798b8aaf 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index 7d78befffe0e..7d78befffe0e 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx
index bb302ad8f9c0..bb302ad8f9c0 100644
--- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx
index aeeb2d6183c0..aeeb2d6183c0 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx
diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index 8e3719eae357..8e3719eae357 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 96c3918a4c42..96c3918a4c42 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
index f0fa2758b7f3..f0fa2758b7f3 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
index d6d405f5ef95..d6d405f5ef95 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
index e8200d6a429a..e8200d6a429a 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
index fda5610e0568..fda5610e0568 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index f09bd03d86a9..f09bd03d86a9 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 420a464319d5..420a464319d5 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index e1e24dab8442..e1e24dab8442 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index e0384426add3..e0384426add3 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 6fe19c742481..6fe19c742481 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
index 588554b7dd92..588554b7dd92 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index a0077a3aa65e..a0077a3aa65e 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index d7f16e1b60bd..d7f16e1b60bd 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx
index 91ac5491e5c6..91ac5491e5c6 100644
--- a/svx/inc/svx/sdr/event/eventhandler.hxx
+++ b/include/svx/sdr/event/eventhandler.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 756d2dac3731..756d2dac3731 100644
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index bd841c6b4255..bd841c6b4255 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx
index 436705536819..436705536819 100644
--- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/include/svx/sdr/overlay/overlaycrosshair.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx
index 7f01c3537e42..7f01c3537e42 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/include/svx/sdr/overlay/overlayhatchrect.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx
index 3ab10df10626..3ab10df10626 100644
--- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx
+++ b/include/svx/sdr/overlay/overlayhelpline.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx
index 8b093fecbfb4..8b093fecbfb4 100644
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/include/svx/sdr/overlay/overlayline.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index e2c23b5dc6df..e2c23b5dc6df 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 7f6dbe05d9e6..7f6dbe05d9e6 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 263e9a9ab57c..263e9a9ab57c 100644
--- a/svx/inc/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 6707c0fc61eb..6707c0fc61eb 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index ea75ace1e94a..ea75ace1e94a 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index d7dd82751f53..d7dd82751f53 100644
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index a2e981c2c1a8..a2e981c2c1a8 100644
--- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
index 3a896aa3cdd8..3a896aa3cdd8 100644
--- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index e96b8fa3281d..e96b8fa3281d 100644
--- a/svx/inc/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx
index 665d445e2d46..665d445e2d46 100644
--- a/svx/inc/svx/sdr/overlay/overlaytools.hxx
+++ b/include/svx/sdr/overlay/overlaytools.hxx
diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index b17e6be8a8c6..b17e6be8a8c6 100644
--- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/include/svx/sdr/primitive2d/primitiveFactory2d.hxx
index d602d28d4f5c..d602d28d4f5c 100644
--- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx
+++ b/include/svx/sdr/primitive2d/primitiveFactory2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index e3e940993790..e3e940993790 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 472c08861412..472c08861412 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 882c2895e0b8..882c2895e0b8 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index a43bd2df72bd..a43bd2df72bd 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index cac426980dee..cac426980dee 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 338fc52567c3..338fc52567c3 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index dfb098e9c010..dfb098e9c010 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 592f14afe742..592f14afe742 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index 0ab554706493..0ab554706493 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 2dfe0243717a..2dfe0243717a 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index a4047bbe3d78..a4047bbe3d78 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 885b9c945da5..885b9c945da5 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 4c685497b1bc..4c685497b1bc 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 37264692f2d8..37264692f2d8 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index 6178695bf66d..6178695bf66d 100644
--- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
index 1d730c054651..1d730c054651 100644
--- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx
index 9f3e4d9f9ad3..9f3e4d9f9ad3 100644
--- a/svx/inc/svx/sdr/properties/attributeproperties.hxx
+++ b/include/svx/sdr/properties/attributeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx
index 484d3139817c..484d3139817c 100644
--- a/svx/inc/svx/sdr/properties/captionproperties.hxx
+++ b/include/svx/sdr/properties/captionproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx
index 3a5ddb910d42..3a5ddb910d42 100644
--- a/svx/inc/svx/sdr/properties/circleproperties.hxx
+++ b/include/svx/sdr/properties/circleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx
index ae70c1d8b3d6..ae70c1d8b3d6 100644
--- a/svx/inc/svx/sdr/properties/connectorproperties.hxx
+++ b/include/svx/sdr/properties/connectorproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx
index ae1e7a70451f..ae1e7a70451f 100644
--- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx
+++ b/include/svx/sdr/properties/customshapeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 5b8b9f4f1c0e..5b8b9f4f1c0e 100644
--- a/svx/inc/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx
index 9175042084aa..9175042084aa 100644
--- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx
index ad7aa529a36c..ad7aa529a36c 100644
--- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx
+++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx
index 17855a6b0658..17855a6b0658 100644
--- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx
+++ b/include/svx/sdr/properties/e3dlatheproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx
index 4bebaab05c2a..4bebaab05c2a 100644
--- a/svx/inc/svx/sdr/properties/e3dproperties.hxx
+++ b/include/svx/sdr/properties/e3dproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx
index e52c483b14e6..e52c483b14e6 100644
--- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/include/svx/sdr/properties/e3dsceneproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx
index d99af2d38c85..d99af2d38c85 100644
--- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx
+++ b/include/svx/sdr/properties/e3dsphereproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx
index 102af739dcf6..102af739dcf6 100644
--- a/svx/inc/svx/sdr/properties/emptyproperties.hxx
+++ b/include/svx/sdr/properties/emptyproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx
index e2a3562440af..e2a3562440af 100644
--- a/svx/inc/svx/sdr/properties/graphicproperties.hxx
+++ b/include/svx/sdr/properties/graphicproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx
index 3de8abf71ea2..3de8abf71ea2 100644
--- a/svx/inc/svx/sdr/properties/groupproperties.hxx
+++ b/include/svx/sdr/properties/groupproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx
index 8649ffb3c10d..8649ffb3c10d 100644
--- a/svx/inc/svx/sdr/properties/itemsettools.hxx
+++ b/include/svx/sdr/properties/itemsettools.hxx
diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx
index 22e42b80dac6..22e42b80dac6 100644
--- a/svx/inc/svx/sdr/properties/measureproperties.hxx
+++ b/include/svx/sdr/properties/measureproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx
index 184f840af272..184f840af272 100644
--- a/svx/inc/svx/sdr/properties/oleproperties.hxx
+++ b/include/svx/sdr/properties/oleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx
index fe7c333cec71..fe7c333cec71 100644
--- a/svx/inc/svx/sdr/properties/pageproperties.hxx
+++ b/include/svx/sdr/properties/pageproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 287cd5b93ef2..287cd5b93ef2 100644
--- a/svx/inc/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx
index 6314f1b136ca..6314f1b136ca 100644
--- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx
+++ b/include/svx/sdr/properties/rectangleproperties.hxx
diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx
index 456b104e60ec..456b104e60ec 100644
--- a/svx/inc/svx/sdr/properties/textproperties.hxx
+++ b/include/svx/sdr/properties/textproperties.hxx
diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx
index 8de846375f5b..8de846375f5b 100644
--- a/svx/inc/svx/sdr/table/tabledesign.hxx
+++ b/include/svx/sdr/table/tabledesign.hxx
diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index ad867f867cfa..ad867f867cfa 100644
--- a/svx/inc/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index 1917a681bb69..1917a681bb69 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx
index 9741afb6f4cf..9741afb6f4cf 100644
--- a/svx/inc/svx/sdrobjectfilter.hxx
+++ b/include/svx/sdrobjectfilter.hxx
diff --git a/svx/inc/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx
index b1e0c7343066..b1e0c7343066 100644
--- a/svx/inc/svx/sdrobjectuser.hxx
+++ b/include/svx/sdrobjectuser.hxx
diff --git a/svx/inc/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx
index 39390fcf6247..39390fcf6247 100644
--- a/svx/inc/svx/sdrpageuser.hxx
+++ b/include/svx/sdrpageuser.hxx
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 85584d724b67..85584d724b67 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index bf8620ca8655..bf8620ca8655 100644
--- a/svx/inc/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
diff --git a/svx/inc/svx/sdshcitm.hxx b/include/svx/sdshcitm.hxx
index f399a069ee61..f399a069ee61 100644
--- a/svx/inc/svx/sdshcitm.hxx
+++ b/include/svx/sdshcitm.hxx
diff --git a/svx/inc/svx/sdshitm.hxx b/include/svx/sdshitm.hxx
index 831fe9a4da5c..831fe9a4da5c 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/include/svx/sdshitm.hxx
diff --git a/svx/inc/svx/sdshtitm.hxx b/include/svx/sdshtitm.hxx
index 39c038a68bda..39c038a68bda 100644
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/include/svx/sdshtitm.hxx
diff --git a/svx/inc/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx
index 84f614c36b97..84f614c36b97 100644
--- a/svx/inc/svx/sdsxyitm.hxx
+++ b/include/svx/sdsxyitm.hxx
diff --git a/svx/inc/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index cf8b0d59f1ee..cf8b0d59f1ee 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
diff --git a/svx/inc/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx
index c80460b00700..c80460b00700 100644
--- a/svx/inc/svx/sdtacitm.hxx
+++ b/include/svx/sdtacitm.hxx
diff --git a/svx/inc/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 687e906bf2f0..687e906bf2f0 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
diff --git a/svx/inc/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx
index eec63d750a7f..eec63d750a7f 100644
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/include/svx/sdtagitm.hxx
diff --git a/svx/inc/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index e9916e33baeb..e9916e33baeb 100644
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
diff --git a/svx/inc/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 82e002a95df2..82e002a95df2 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
diff --git a/svx/inc/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 057bfe522535..057bfe522535 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
diff --git a/svx/inc/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index c852087b83a7..c852087b83a7 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
diff --git a/svx/inc/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx
index b7f92f1d0e5a..b7f92f1d0e5a 100644
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/include/svx/sdtcfitm.hxx
diff --git a/svx/inc/svx/sdtditm.hxx b/include/svx/sdtditm.hxx
index c33da1f406f3..c33da1f406f3 100644
--- a/svx/inc/svx/sdtditm.hxx
+++ b/include/svx/sdtditm.hxx
diff --git a/svx/inc/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 42874cbc6fb3..42874cbc6fb3 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
diff --git a/svx/inc/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 6d15c560e575..6d15c560e575 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
diff --git a/svx/inc/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx
index 6e6ddff28136..6e6ddff28136 100644
--- a/svx/inc/svx/sdtmfitm.hxx
+++ b/include/svx/sdtmfitm.hxx
diff --git a/svx/inc/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index 387c3c40f725..387c3c40f725 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
diff --git a/svx/inc/svx/selctrl.hxx b/include/svx/selctrl.hxx
index eff2675eb5f1..eff2675eb5f1 100644
--- a/svx/inc/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
diff --git a/svx/inc/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index e65bbe4b5e74..e65bbe4b5e74 100644
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
diff --git a/svx/inc/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx
index d46b6278b749..d46b6278b749 100644
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/include/svx/shapeproperty.hxx
diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index e16c23089658..e16c23089658 100644
--- a/svx/inc/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
diff --git a/svx/inc/svx/simptabl.hxx b/include/svx/simptabl.hxx
index 8e448bc8b2c0..8e448bc8b2c0 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/include/svx/simptabl.hxx
diff --git a/svx/inc/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index eb1bb7dfdb00..eb1bb7dfdb00 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
diff --git a/svx/inc/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 9282e3e8cc7e..9282e3e8cc7e 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
diff --git a/svx/inc/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 8f65c17a8781..8f65c17a8781 100644
--- a/svx/inc/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
diff --git a/svx/inc/svx/strarray.hxx b/include/svx/strarray.hxx
index 9599ae3f3fc4..9599ae3f3fc4 100644
--- a/svx/inc/svx/strarray.hxx
+++ b/include/svx/strarray.hxx
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx
index f3f1bb52cf04..f3f1bb52cf04 100644
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/include/svx/subtoolboxcontrol.hxx
diff --git a/svx/inc/svx/svdattr.hxx b/include/svx/svdattr.hxx
index dbe29bb9a874..dbe29bb9a874 100644
--- a/svx/inc/svx/svdattr.hxx
+++ b/include/svx/svdattr.hxx
diff --git a/svx/inc/svx/svdattrx.hxx b/include/svx/svdattrx.hxx
index ca1aa00c4292..ca1aa00c4292 100644
--- a/svx/inc/svx/svdattrx.hxx
+++ b/include/svx/svdattrx.hxx
diff --git a/svx/inc/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 9a95ba1d377d..9a95ba1d377d 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
diff --git a/svx/inc/svx/svddef.hxx b/include/svx/svddef.hxx
index af70697f5053..af70697f5053 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
diff --git a/svx/inc/svx/svddrag.hxx b/include/svx/svddrag.hxx
index a5236e1579c2..a5236e1579c2 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
diff --git a/svx/inc/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 3fc7fbb38168..3fc7fbb38168 100644
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
diff --git a/svx/inc/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 3a5f09cdb6d8..3a5f09cdb6d8 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
diff --git a/svx/inc/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 39e75ad18738..39e75ad18738 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
diff --git a/svx/inc/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 13cf6f05b5ef..13cf6f05b5ef 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
diff --git a/svx/inc/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 22a91d3e55c1..22a91d3e55c1 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
diff --git a/svx/inc/svx/svdfield.hxx b/include/svx/svdfield.hxx
index 9a4fbd8caf00..9a4fbd8caf00 100644
--- a/svx/inc/svx/svdfield.hxx
+++ b/include/svx/svdfield.hxx
diff --git a/svx/inc/svx/svdglev.hxx b/include/svx/svdglev.hxx
index c0a460d021d6..c0a460d021d6 100644
--- a/svx/inc/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
diff --git a/svx/inc/svx/svdglob.hxx b/include/svx/svdglob.hxx
index dbec676cfbb5..dbec676cfbb5 100644
--- a/svx/inc/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
diff --git a/svx/inc/svx/svdglue.hxx b/include/svx/svdglue.hxx
index f667f4f0d743..f667f4f0d743 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
diff --git a/svx/inc/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 2a58f612ec8c..2a58f612ec8c 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
diff --git a/svx/inc/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index 1c011808cb47..1c011808cb47 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
diff --git a/svx/inc/svx/svditer.hxx b/include/svx/svditer.hxx
index d58512138b79..d58512138b79 100644
--- a/svx/inc/svx/svditer.hxx
+++ b/include/svx/svditer.hxx
diff --git a/svx/inc/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index c405cdb8f32f..c405cdb8f32f 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
diff --git a/svx/inc/svx/svdmark.hxx b/include/svx/svdmark.hxx
index d8058fb41357..d8058fb41357 100644
--- a/svx/inc/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
diff --git a/svx/inc/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d57c992f3ace..d57c992f3ace 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
diff --git a/svx/inc/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 133a438bd58f..133a438bd58f 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
diff --git a/svx/inc/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index ee7e11ba194a..ee7e11ba194a 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
diff --git a/svx/inc/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index 46f1da0da01f..46f1da0da01f 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
diff --git a/svx/inc/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 5d4f76d0b804..5d4f76d0b804 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
diff --git a/svx/inc/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 54c67fb849f3..54c67fb849f3 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
diff --git a/svx/inc/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index d613327b309b..d613327b309b 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
diff --git a/svx/inc/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index ea0968cd9487..ea0968cd9487 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
diff --git a/svx/inc/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 036a83e6144a..036a83e6144a 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
diff --git a/svx/inc/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 57842579b54e..57842579b54e 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
diff --git a/svx/inc/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 439ceb25682d..439ceb25682d 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
diff --git a/svx/inc/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 48a29cb029f7..48a29cb029f7 100644
--- a/svx/inc/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
diff --git a/svx/inc/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index ee5542c90def..ee5542c90def 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
diff --git a/svx/inc/svx/svdopage.hxx b/include/svx/svdopage.hxx
index 2109dfbf9e54..2109dfbf9e54 100644
--- a/svx/inc/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
diff --git a/svx/inc/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 61f3c90720a8..61f3c90720a8 100644
--- a/svx/inc/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
diff --git a/svx/inc/svx/svdorect.hxx b/include/svx/svdorect.hxx
index f984bb2c68ad..f984bb2c68ad 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
diff --git a/svx/inc/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 6ec0334c2d21..6ec0334c2d21 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
diff --git a/svx/inc/svx/svdotext.hxx b/include/svx/svdotext.hxx
index a5df49bdd24f..a5df49bdd24f 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
diff --git a/svx/inc/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 243bcce4f61d..243bcce4f61d 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
diff --git a/svx/inc/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index 43d5468c259a..43d5468c259a 100644
--- a/svx/inc/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
diff --git a/svx/inc/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index e7493f55ac90..e7493f55ac90 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
diff --git a/svx/inc/svx/svdpage.hxx b/include/svx/svdpage.hxx
index c8dd083019a4..c8dd083019a4 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
diff --git a/svx/inc/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index b43db7da37ed..b43db7da37ed 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
diff --git a/svx/inc/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 2e9bc2534adb..2e9bc2534adb 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
diff --git a/svx/inc/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index d89fdc1ac51d..d89fdc1ac51d 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
diff --git a/svx/inc/svx/svdpool.hxx b/include/svx/svdpool.hxx
index e90e6d89c5f9..e90e6d89c5f9 100644
--- a/svx/inc/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
diff --git a/svx/inc/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 95e93858467e..95e93858467e 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
diff --git a/svx/inc/svx/svdsob.hxx b/include/svx/svdsob.hxx
index 146731c996e8..146731c996e8 100644
--- a/svx/inc/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
diff --git a/svx/inc/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a78d88dfdb2d..a78d88dfdb2d 100644
--- a/svx/inc/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
diff --git a/svx/inc/svx/svdtext.hxx b/include/svx/svdtext.hxx
index 810f701d55fc..810f701d55fc 100644
--- a/svx/inc/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
diff --git a/svx/inc/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index c86fd0d35582..c86fd0d35582 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
diff --git a/svx/inc/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index ff5f36281244..ff5f36281244 100644
--- a/svx/inc/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
diff --git a/svx/inc/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 22211640e148..22211640e148 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
diff --git a/svx/inc/svx/svdview.hxx b/include/svx/svdview.hxx
index ef28a17f4513..ef28a17f4513 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
diff --git a/svx/inc/svx/svdviter.hxx b/include/svx/svdviter.hxx
index 1ad9f9c773e6..1ad9f9c773e6 100644
--- a/svx/inc/svx/svdviter.hxx
+++ b/include/svx/svdviter.hxx
diff --git a/svx/inc/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 1d7a16102164..1d7a16102164 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
diff --git a/svx/inc/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index bb8c4c26a19d..bb8c4c26a19d 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
diff --git a/svx/inc/svx/svxcommands.h b/include/svx/svxcommands.h
index 266d3d691df7..266d3d691df7 100644
--- a/svx/inc/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
diff --git a/svx/inc/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index fd8ced079923..fd8ced079923 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
diff --git a/svx/inc/svx/svxdllapi.h b/include/svx/svxdllapi.h
index 0d6bf0a8fecb..0d6bf0a8fecb 100644
--- a/svx/inc/svx/svxdllapi.h
+++ b/include/svx/svxdllapi.h
diff --git a/svx/inc/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 939bfecb71d4..939bfecb71d4 100644
--- a/svx/inc/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
diff --git a/svx/inc/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index d18c8f3b6af2..d18c8f3b6af2 100644
--- a/svx/inc/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
diff --git a/svx/inc/svx/svxids.hrc b/include/svx/svxids.hrc
index 3c11c3686efe..3c11c3686efe 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
diff --git a/svx/inc/svx/svxitems.hrc b/include/svx/svxitems.hrc
index 44a68ebdbd9f..44a68ebdbd9f 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
diff --git a/svx/inc/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 0f08f1506943..0f08f1506943 100644
--- a/svx/inc/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
diff --git a/svx/inc/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index a6ecc3a7605e..a6ecc3a7605e 100644
--- a/svx/inc/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
diff --git a/svx/inc/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx
index a42906eb28c7..a42906eb28c7 100644
--- a/svx/inc/svx/swframevalidation.hxx
+++ b/include/svx/swframevalidation.hxx
diff --git a/svx/inc/svx/sxallitm.hxx b/include/svx/sxallitm.hxx
index 7d6c66a870cd..7d6c66a870cd 100644
--- a/svx/inc/svx/sxallitm.hxx
+++ b/include/svx/sxallitm.hxx
diff --git a/svx/inc/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx
index 66856eb33fb0..66856eb33fb0 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/include/svx/sxcaitm.hxx
diff --git a/svx/inc/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index eabbaeed1d9b..eabbaeed1d9b 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
diff --git a/svx/inc/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx
index 56301de03c27..56301de03c27 100644
--- a/svx/inc/svx/sxcgitm.hxx
+++ b/include/svx/sxcgitm.hxx
diff --git a/svx/inc/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx
index 16bb59d1c2eb..16bb59d1c2eb 100644
--- a/svx/inc/svx/sxciaitm.hxx
+++ b/include/svx/sxciaitm.hxx
diff --git a/svx/inc/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx
index 436370e588b1..436370e588b1 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/include/svx/sxcikitm.hxx
diff --git a/svx/inc/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index 04b9a5d75c03..04b9a5d75c03 100644
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
diff --git a/svx/inc/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index ba8d01190b47..ba8d01190b47 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
diff --git a/svx/inc/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index 73bb20959fd9..73bb20959fd9 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
diff --git a/svx/inc/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index 6a97f4f4df42..6a97f4f4df42 100644
--- a/svx/inc/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
diff --git a/svx/inc/svx/sxenditm.hxx b/include/svx/sxenditm.hxx
index cd9d09b89632..cd9d09b89632 100644
--- a/svx/inc/svx/sxenditm.hxx
+++ b/include/svx/sxenditm.hxx
diff --git a/svx/inc/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
index 688f54bb65d5..688f54bb65d5 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/include/svx/sxfiitm.hxx
diff --git a/svx/inc/svx/sxlayitm.hxx b/include/svx/sxlayitm.hxx
index 205e755660bb..205e755660bb 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/include/svx/sxlayitm.hxx
diff --git a/svx/inc/svx/sxlogitm.hxx b/include/svx/sxlogitm.hxx
index c295522fe8de..c295522fe8de 100644
--- a/svx/inc/svx/sxlogitm.hxx
+++ b/include/svx/sxlogitm.hxx
diff --git a/svx/inc/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index fd32430c58c6..fd32430c58c6 100644
--- a/svx/inc/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
diff --git a/svx/inc/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx
index e24bc150c9c1..e24bc150c9c1 100644
--- a/svx/inc/svx/sxmfsitm.hxx
+++ b/include/svx/sxmfsitm.hxx
diff --git a/svx/inc/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx
index 56fe21d7478a..56fe21d7478a 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/include/svx/sxmkitm.hxx
diff --git a/svx/inc/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx
index 29e46cd616c3..29e46cd616c3 100644
--- a/svx/inc/svx/sxmlhitm.hxx
+++ b/include/svx/sxmlhitm.hxx
diff --git a/svx/inc/svx/sxmoitm.hxx b/include/svx/sxmoitm.hxx
index 8b5cfc2a9cb4..8b5cfc2a9cb4 100644
--- a/svx/inc/svx/sxmoitm.hxx
+++ b/include/svx/sxmoitm.hxx
diff --git a/svx/inc/svx/sxmovitm.hxx b/include/svx/sxmovitm.hxx
index 97fa1e1f71d4..97fa1e1f71d4 100644
--- a/svx/inc/svx/sxmovitm.hxx
+++ b/include/svx/sxmovitm.hxx
diff --git a/svx/inc/svx/sxmsitm.hxx b/include/svx/sxmsitm.hxx
index 52beec424cd6..52beec424cd6 100644
--- a/svx/inc/svx/sxmsitm.hxx
+++ b/include/svx/sxmsitm.hxx
diff --git a/svx/inc/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx
index 9f4116567b05..9f4116567b05 100644
--- a/svx/inc/svx/sxmspitm.hxx
+++ b/include/svx/sxmspitm.hxx
diff --git a/svx/inc/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx
index 679435c66656..679435c66656 100644
--- a/svx/inc/svx/sxmsuitm.hxx
+++ b/include/svx/sxmsuitm.hxx
diff --git a/svx/inc/svx/sxmtaitm.hxx b/include/svx/sxmtaitm.hxx
index 583c0b18c7a6..583c0b18c7a6 100644
--- a/svx/inc/svx/sxmtaitm.hxx
+++ b/include/svx/sxmtaitm.hxx
diff --git a/svx/inc/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 4be65b5d72ae..4be65b5d72ae 100644
--- a/svx/inc/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
diff --git a/svx/inc/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index bc4966228c8c..bc4966228c8c 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
diff --git a/svx/inc/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx
index 3ad063eba082..3ad063eba082 100644
--- a/svx/inc/svx/sxmtritm.hxx
+++ b/include/svx/sxmtritm.hxx
diff --git a/svx/inc/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 24a07a252e7f..24a07a252e7f 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
diff --git a/svx/inc/svx/sxoneitm.hxx b/include/svx/sxoneitm.hxx
index cf85d629f508..cf85d629f508 100644
--- a/svx/inc/svx/sxoneitm.hxx
+++ b/include/svx/sxoneitm.hxx
diff --git a/svx/inc/svx/sxonitm.hxx b/include/svx/sxonitm.hxx
index 047146b4fd8b..047146b4fd8b 100644
--- a/svx/inc/svx/sxonitm.hxx
+++ b/include/svx/sxonitm.hxx
diff --git a/svx/inc/svx/sxopitm.hxx b/include/svx/sxopitm.hxx
index 4b2a3c02b7af..4b2a3c02b7af 100644
--- a/svx/inc/svx/sxopitm.hxx
+++ b/include/svx/sxopitm.hxx
diff --git a/svx/inc/svx/sxraitm.hxx b/include/svx/sxraitm.hxx
index f108e720bd1b..f108e720bd1b 100644
--- a/svx/inc/svx/sxraitm.hxx
+++ b/include/svx/sxraitm.hxx
diff --git a/svx/inc/svx/sxreaitm.hxx b/include/svx/sxreaitm.hxx
index 62ff9f979289..62ff9f979289 100644
--- a/svx/inc/svx/sxreaitm.hxx
+++ b/include/svx/sxreaitm.hxx
diff --git a/svx/inc/svx/sxreoitm.hxx b/include/svx/sxreoitm.hxx
index 8b5ce5ea2748..8b5ce5ea2748 100644
--- a/svx/inc/svx/sxreoitm.hxx
+++ b/include/svx/sxreoitm.hxx
diff --git a/svx/inc/svx/sxroaitm.hxx b/include/svx/sxroaitm.hxx
index bf9b2b6ef247..bf9b2b6ef247 100644
--- a/svx/inc/svx/sxroaitm.hxx
+++ b/include/svx/sxroaitm.hxx
diff --git a/svx/inc/svx/sxrooitm.hxx b/include/svx/sxrooitm.hxx
index ec171996ebb1..ec171996ebb1 100644
--- a/svx/inc/svx/sxrooitm.hxx
+++ b/include/svx/sxrooitm.hxx
diff --git a/svx/inc/svx/sxsaitm.hxx b/include/svx/sxsaitm.hxx
index 1085b0d21fe3..1085b0d21fe3 100644
--- a/svx/inc/svx/sxsaitm.hxx
+++ b/include/svx/sxsaitm.hxx
diff --git a/svx/inc/svx/sxsalitm.hxx b/include/svx/sxsalitm.hxx
index 2d70e2ba480f..2d70e2ba480f 100644
--- a/svx/inc/svx/sxsalitm.hxx
+++ b/include/svx/sxsalitm.hxx
diff --git a/svx/inc/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
index e2a0052eff67..e2a0052eff67 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/include/svx/sxsiitm.hxx
diff --git a/svx/inc/svx/sxsoitm.hxx b/include/svx/sxsoitm.hxx
index cf7b1ae84c57..cf7b1ae84c57 100644
--- a/svx/inc/svx/sxsoitm.hxx
+++ b/include/svx/sxsoitm.hxx
diff --git a/svx/inc/svx/sxtraitm.hxx b/include/svx/sxtraitm.hxx
index fb60bc54f53e..fb60bc54f53e 100644
--- a/svx/inc/svx/sxtraitm.hxx
+++ b/include/svx/sxtraitm.hxx
diff --git a/svx/inc/svx/tabarea.hxx b/include/svx/tabarea.hxx
index aa49d2a5fe94..aa49d2a5fe94 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/include/svx/tabarea.hxx
diff --git a/svx/inc/svx/tabline.hxx b/include/svx/tabline.hxx
index aa415988e197..aa415988e197 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
diff --git a/svx/inc/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index b4bffeee4831..b4bffeee4831 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
diff --git a/svx/inc/svx/tbxalign.hxx b/include/svx/tbxalign.hxx
index e41a07813404..e41a07813404 100644
--- a/svx/inc/svx/tbxalign.hxx
+++ b/include/svx/tbxalign.hxx
diff --git a/svx/inc/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx
index e0a1d27f1aec..e0a1d27f1aec 100644
--- a/svx/inc/svx/tbxcolor.hxx
+++ b/include/svx/tbxcolor.hxx
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 0df0efde4090..0df0efde4090 100644
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
diff --git a/svx/inc/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index 07cf3a57c5ae..07cf3a57c5ae 100644
--- a/svx/inc/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index 66fde8a2cb79..66fde8a2cb79 100644
--- a/svx/inc/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
diff --git a/svx/inc/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx
index f905cc657406..f905cc657406 100644
--- a/svx/inc/svx/tbxdraw.hxx
+++ b/include/svx/tbxdraw.hxx
diff --git a/svx/inc/svx/txencbox.hxx b/include/svx/txencbox.hxx
index b8b470116019..b8b470116019 100644
--- a/svx/inc/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
diff --git a/svx/inc/svx/txenctab.hxx b/include/svx/txenctab.hxx
index 0b8d14e89b74..0b8d14e89b74 100644
--- a/svx/inc/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
diff --git a/svx/inc/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index f41d223fa13e..f41d223fa13e 100644
--- a/svx/inc/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
diff --git a/svx/inc/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 54dfbbdd5250..54dfbbdd5250 100644
--- a/svx/inc/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
diff --git a/svx/inc/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 2ceca3ec895d..2ceca3ec895d 100644
--- a/svx/inc/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
diff --git a/svx/inc/svx/unofill.hxx b/include/svx/unofill.hxx
index 523905a1d97a..523905a1d97a 100644
--- a/svx/inc/svx/unofill.hxx
+++ b/include/svx/unofill.hxx
diff --git a/svx/inc/svx/unomaster.hxx b/include/svx/unomaster.hxx
index c0f32d0f1346..c0f32d0f1346 100644
--- a/svx/inc/svx/unomaster.hxx
+++ b/include/svx/unomaster.hxx
diff --git a/svx/inc/svx/unomid.hxx b/include/svx/unomid.hxx
index cf4c4f4e02c1..cf4c4f4e02c1 100644
--- a/svx/inc/svx/unomid.hxx
+++ b/include/svx/unomid.hxx
diff --git a/svx/inc/svx/unomod.hxx b/include/svx/unomod.hxx
index fe648ea4419f..fe648ea4419f 100644
--- a/svx/inc/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
diff --git a/svx/inc/svx/unomodel.hxx b/include/svx/unomodel.hxx
index fcf203fa47e8..fcf203fa47e8 100644
--- a/svx/inc/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
diff --git a/svx/inc/svx/unopage.hxx b/include/svx/unopage.hxx
index 68150aff0312..68150aff0312 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
diff --git a/svx/inc/svx/unopool.hxx b/include/svx/unopool.hxx
index 7db02b2a85dd..7db02b2a85dd 100644
--- a/svx/inc/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
diff --git a/svx/inc/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 0414e1228211..0414e1228211 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
diff --git a/svx/inc/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 23cbf8811a3a..23cbf8811a3a 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
diff --git a/svx/inc/svx/unoshcol.hxx b/include/svx/unoshcol.hxx
index 7db908c88a92..7db908c88a92 100644
--- a/svx/inc/svx/unoshcol.hxx
+++ b/include/svx/unoshcol.hxx
diff --git a/svx/inc/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index c39854f76b97..c39854f76b97 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
diff --git a/svx/inc/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index cefc7012a0fd..cefc7012a0fd 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index f705be2ff882..f705be2ff882 100644
--- a/svx/inc/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
diff --git a/svx/inc/svx/view3d.hxx b/include/svx/view3d.hxx
index 7f4d52307450..7f4d52307450 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx
index c7509ea7c1d1..c7509ea7c1d1 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/include/svx/viewlayoutitem.hxx
diff --git a/svx/inc/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index 6b00ae2fa186..6b00ae2fa186 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
diff --git a/svx/inc/svx/wrapfield.hxx b/include/svx/wrapfield.hxx
index c8fa94ece3ce..c8fa94ece3ce 100644
--- a/svx/inc/svx/wrapfield.hxx
+++ b/include/svx/wrapfield.hxx
diff --git a/svx/inc/svx/xattr.hxx b/include/svx/xattr.hxx
index d3d1a1b6e057..d3d1a1b6e057 100644
--- a/svx/inc/svx/xattr.hxx
+++ b/include/svx/xattr.hxx
diff --git a/svx/inc/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 959ceafdbd72..959ceafdbd72 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
diff --git a/svx/inc/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index d30e2fd5001f..d30e2fd5001f 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
diff --git a/svx/inc/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 461c2b38af7e..461c2b38af7e 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
diff --git a/svx/inc/svx/xdash.hxx b/include/svx/xdash.hxx
index a55d3b83fa67..a55d3b83fa67 100644
--- a/svx/inc/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
diff --git a/svx/inc/svx/xdef.hxx b/include/svx/xdef.hxx
index ea38bbbbf644..ea38bbbbf644 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/include/svx/xdef.hxx
diff --git a/svx/inc/svx/xenum.hxx b/include/svx/xenum.hxx
index df0b629d5980..df0b629d5980 100644
--- a/svx/inc/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
diff --git a/svx/inc/svx/xexch.hxx b/include/svx/xexch.hxx
index bd0034d972a2..bd0034d972a2 100644
--- a/svx/inc/svx/xexch.hxx
+++ b/include/svx/xexch.hxx
diff --git a/svx/inc/svx/xfillit.hxx b/include/svx/xfillit.hxx
index b0270a9d3aa9..b0270a9d3aa9 100644
--- a/svx/inc/svx/xfillit.hxx
+++ b/include/svx/xfillit.hxx
diff --git a/svx/inc/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 596d9c9ae8b4..596d9c9ae8b4 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
diff --git a/svx/inc/svx/xflasit.hxx b/include/svx/xflasit.hxx
index 44c95e08eabf..44c95e08eabf 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/include/svx/xflasit.hxx
diff --git a/svx/inc/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index 85bd4dabad17..85bd4dabad17 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
diff --git a/svx/inc/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index 3c9ea1ce5654..3c9ea1ce5654 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
diff --git a/svx/inc/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index 5ed01b015d99..5ed01b015d99 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
diff --git a/svx/inc/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx
index 0042e5ad57cd..0042e5ad57cd 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/include/svx/xflbmsxy.hxx
diff --git a/svx/inc/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index c5517d0c6759..c5517d0c6759 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
diff --git a/svx/inc/svx/xflboxy.hxx b/include/svx/xflboxy.hxx
index 5304484d3892..5304484d3892 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/include/svx/xflboxy.hxx
diff --git a/svx/inc/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index ca14d6a341d8..ca14d6a341d8 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
diff --git a/svx/inc/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx
index e02345abdd37..e02345abdd37 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/include/svx/xflbtoxy.hxx
diff --git a/svx/inc/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 7c0320ffe2f7..7c0320ffe2f7 100644
--- a/svx/inc/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
diff --git a/svx/inc/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 494cc99f21fe..494cc99f21fe 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
diff --git a/svx/inc/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 1c2401f03dda..1c2401f03dda 100644
--- a/svx/inc/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
diff --git a/svx/inc/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 3b95e97c6a3c..3b95e97c6a3c 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
diff --git a/svx/inc/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 52f475c31845..52f475c31845 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
diff --git a/svx/inc/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 0f52f64d3c05..0f52f64d3c05 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
diff --git a/svx/inc/svx/xftdiit.hxx b/include/svx/xftdiit.hxx
index 0260e29687f9..0260e29687f9 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/include/svx/xftdiit.hxx
diff --git a/svx/inc/svx/xftmrit.hxx b/include/svx/xftmrit.hxx
index 815049e3bb7c..815049e3bb7c 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/include/svx/xftmrit.hxx
diff --git a/svx/inc/svx/xftouit.hxx b/include/svx/xftouit.hxx
index 457247fa6cd2..457247fa6cd2 100644
--- a/svx/inc/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
diff --git a/svx/inc/svx/xftsfit.hxx b/include/svx/xftsfit.hxx
index ca4bd2b3f7fb..ca4bd2b3f7fb 100644
--- a/svx/inc/svx/xftsfit.hxx
+++ b/include/svx/xftsfit.hxx
diff --git a/svx/inc/svx/xftshcit.hxx b/include/svx/xftshcit.hxx
index 8a84b2c1c84b..8a84b2c1c84b 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/include/svx/xftshcit.hxx
diff --git a/svx/inc/svx/xftshit.hxx b/include/svx/xftshit.hxx
index 5ae8fc76078f..5ae8fc76078f 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
diff --git a/svx/inc/svx/xftshtit.hxx b/include/svx/xftshtit.hxx
index e87e4a4f3cc5..e87e4a4f3cc5 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/include/svx/xftshtit.hxx
diff --git a/svx/inc/svx/xftshxy.hxx b/include/svx/xftshxy.hxx
index eb6ffb6020cc..eb6ffb6020cc 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/include/svx/xftshxy.hxx
diff --git a/svx/inc/svx/xftstit.hxx b/include/svx/xftstit.hxx
index 2a53b26b41c1..2a53b26b41c1 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/include/svx/xftstit.hxx
diff --git a/svx/inc/svx/xgrad.hxx b/include/svx/xgrad.hxx
index ba97db142e7d..ba97db142e7d 100644
--- a/svx/inc/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
diff --git a/svx/inc/svx/xgrscit.hxx b/include/svx/xgrscit.hxx
index 491a7d41d502..491a7d41d502 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/include/svx/xgrscit.hxx
diff --git a/svx/inc/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 9db4a6a0364b..9db4a6a0364b 100644
--- a/svx/inc/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
diff --git a/svx/inc/svx/xit.hxx b/include/svx/xit.hxx
index ee1dc376f122..ee1dc376f122 100644
--- a/svx/inc/svx/xit.hxx
+++ b/include/svx/xit.hxx
diff --git a/svx/inc/svx/xlineit.hxx b/include/svx/xlineit.hxx
index f32193330b90..f32193330b90 100644
--- a/svx/inc/svx/xlineit.hxx
+++ b/include/svx/xlineit.hxx
diff --git a/svx/inc/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index 18fef85b45c7..18fef85b45c7 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
diff --git a/svx/inc/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 321656d9ed72..321656d9ed72 100644
--- a/svx/inc/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
diff --git a/svx/inc/svx/xlnasit.hxx b/include/svx/xlnasit.hxx
index 3eea09f6ba02..3eea09f6ba02 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/include/svx/xlnasit.hxx
diff --git a/svx/inc/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 620a7adfc4b3..620a7adfc4b3 100644
--- a/svx/inc/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
diff --git a/svx/inc/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index 609efaec9e65..609efaec9e65 100644
--- a/svx/inc/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
diff --git a/svx/inc/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index a4d7a6ca7122..a4d7a6ca7122 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
diff --git a/svx/inc/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index d06deb80a219..d06deb80a219 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
diff --git a/svx/inc/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index fdf9abdda894..fdf9abdda894 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
diff --git a/svx/inc/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index e960ea24f8c5..e960ea24f8c5 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
diff --git a/svx/inc/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index 241eb668a05e..241eb668a05e 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
diff --git a/svx/inc/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 1d57bf009b7c..1d57bf009b7c 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
diff --git a/svx/inc/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index 776b97519fcd..776b97519fcd 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
diff --git a/svx/inc/svx/xlntrit.hxx b/include/svx/xlntrit.hxx
index 8cb0e705ba87..8cb0e705ba87 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/include/svx/xlntrit.hxx
diff --git a/svx/inc/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index d8d60ad9022b..d8d60ad9022b 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
diff --git a/svx/inc/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 934606fe8917..934606fe8917 100644
--- a/svx/inc/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
diff --git a/svx/inc/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 8019779b3748..8019779b3748 100644
--- a/svx/inc/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
diff --git a/svx/inc/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index d14c9dc5cd23..d14c9dc5cd23 100644
--- a/svx/inc/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
diff --git a/svx/inc/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx
index 8fd46b07c22f..8fd46b07c22f 100644
--- a/svx/inc/svx/xmlsecctrl.hxx
+++ b/include/svx/xmlsecctrl.hxx
diff --git a/svx/inc/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index 0c614b93c356..0c614b93c356 100644
--- a/svx/inc/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
diff --git a/svx/inc/svx/xpoly.hxx b/include/svx/xpoly.hxx
index f6a846f6b470..f6a846f6b470 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
diff --git a/svx/inc/svx/xpool.hxx b/include/svx/xpool.hxx
index e7838d6e8faa..e7838d6e8faa 100644
--- a/svx/inc/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
diff --git a/svx/inc/svx/xsetit.hxx b/include/svx/xsetit.hxx
index c5f59d2fb1ae..c5f59d2fb1ae 100644
--- a/svx/inc/svx/xsetit.hxx
+++ b/include/svx/xsetit.hxx
diff --git a/svx/inc/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index 1634eb053543..1634eb053543 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
diff --git a/svx/inc/svx/xtable.hxx b/include/svx/xtable.hxx
index 93ad230ea75f..93ad230ea75f 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
diff --git a/svx/inc/svx/xtextit.hxx b/include/svx/xtextit.hxx
index 40a33b2afa32..40a33b2afa32 100644
--- a/svx/inc/svx/xtextit.hxx
+++ b/include/svx/xtextit.hxx
diff --git a/svx/inc/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 9e4478f2eec6..9e4478f2eec6 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
diff --git a/svx/inc/svx/zoom_def.hxx b/include/svx/zoom_def.hxx
index e71f12f36995..e71f12f36995 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/include/svx/zoom_def.hxx
diff --git a/svx/inc/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index c09acf1d5901..c09acf1d5901 100644
--- a/svx/inc/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index f6be6ed760d5..f6be6ed760d5 100644
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
diff --git a/svx/inc/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index d3b726cba6b8..d3b726cba6b8 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
diff --git a/test/inc/test/beans/xpropertyset.hxx b/include/test/beans/xpropertyset.hxx
index b5962665f56b..b5962665f56b 100644
--- a/test/inc/test/beans/xpropertyset.hxx
+++ b/include/test/beans/xpropertyset.hxx
diff --git a/test/inc/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx
index d8eaa1d3831b..d8eaa1d3831b 100644
--- a/test/inc/test/bootstrapfixture.hxx
+++ b/include/test/bootstrapfixture.hxx
diff --git a/test/inc/test/container/xelementaccess.hxx b/include/test/container/xelementaccess.hxx
index 71306d345df7..71306d345df7 100644
--- a/test/inc/test/container/xelementaccess.hxx
+++ b/include/test/container/xelementaccess.hxx
diff --git a/test/inc/test/container/xindexaccess.hxx b/include/test/container/xindexaccess.hxx
index 1962f9f6eb13..1962f9f6eb13 100644
--- a/test/inc/test/container/xindexaccess.hxx
+++ b/include/test/container/xindexaccess.hxx
diff --git a/test/inc/test/container/xnamecontainer.hxx b/include/test/container/xnamecontainer.hxx
index c231daecc0c9..c231daecc0c9 100644
--- a/test/inc/test/container/xnamecontainer.hxx
+++ b/include/test/container/xnamecontainer.hxx
diff --git a/test/inc/test/container/xnamed.hxx b/include/test/container/xnamed.hxx
index acb367ead4a8..acb367ead4a8 100644
--- a/test/inc/test/container/xnamed.hxx
+++ b/include/test/container/xnamed.hxx
diff --git a/test/inc/test/container/xnamereplace.hxx b/include/test/container/xnamereplace.hxx
index 6b616cdec1a8..6b616cdec1a8 100644
--- a/test/inc/test/container/xnamereplace.hxx
+++ b/include/test/container/xnamereplace.hxx
diff --git a/test/inc/test/sheet/cellproperties.hxx b/include/test/sheet/cellproperties.hxx
index 49f9c37246cb..49f9c37246cb 100644
--- a/test/inc/test/sheet/cellproperties.hxx
+++ b/include/test/sheet/cellproperties.hxx
diff --git a/test/inc/test/sheet/datapilotfield.hxx b/include/test/sheet/datapilotfield.hxx
index 253bdf474ac2..253bdf474ac2 100644
--- a/test/inc/test/sheet/datapilotfield.hxx
+++ b/include/test/sheet/datapilotfield.hxx
diff --git a/test/inc/test/sheet/tableautoformatfield.hxx b/include/test/sheet/tableautoformatfield.hxx
index 6b6d79f1fe57..6b6d79f1fe57 100644
--- a/test/inc/test/sheet/tableautoformatfield.hxx
+++ b/include/test/sheet/tableautoformatfield.hxx
diff --git a/test/inc/test/sheet/xcellrangedata.hxx b/include/test/sheet/xcellrangedata.hxx
index dd56045b8649..dd56045b8649 100644
--- a/test/inc/test/sheet/xcellrangedata.hxx
+++ b/include/test/sheet/xcellrangedata.hxx
diff --git a/test/inc/test/sheet/xcellrangereferrer.hxx b/include/test/sheet/xcellrangereferrer.hxx
index 22044302b087..22044302b087 100644
--- a/test/inc/test/sheet/xcellrangereferrer.hxx
+++ b/include/test/sheet/xcellrangereferrer.hxx
diff --git a/test/inc/test/sheet/xcellrangesquery.hxx b/include/test/sheet/xcellrangesquery.hxx
index 3d419b7c8203..3d419b7c8203 100644
--- a/test/inc/test/sheet/xcellrangesquery.hxx
+++ b/include/test/sheet/xcellrangesquery.hxx
diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/include/test/sheet/xdatabaserange.hxx
index 2be7e4dc663f..2be7e4dc663f 100644
--- a/test/inc/test/sheet/xdatabaserange.hxx
+++ b/include/test/sheet/xdatabaserange.hxx
diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/include/test/sheet/xdatapilotdescriptor.hxx
index 55b26a3bbfe7..55b26a3bbfe7 100644
--- a/test/inc/test/sheet/xdatapilotdescriptor.hxx
+++ b/include/test/sheet/xdatapilotdescriptor.hxx
diff --git a/test/inc/test/sheet/xdatapilotfieldgrouping.hxx b/include/test/sheet/xdatapilotfieldgrouping.hxx
index fd11a45cb051..fd11a45cb051 100644
--- a/test/inc/test/sheet/xdatapilotfieldgrouping.hxx
+++ b/include/test/sheet/xdatapilotfieldgrouping.hxx
diff --git a/test/inc/test/sheet/xdatapilottable.hxx b/include/test/sheet/xdatapilottable.hxx
index 27c5f2a7ca8c..27c5f2a7ca8c 100644
--- a/test/inc/test/sheet/xdatapilottable.hxx
+++ b/include/test/sheet/xdatapilottable.hxx
diff --git a/test/inc/test/sheet/xdatapilottable2.hxx b/include/test/sheet/xdatapilottable2.hxx
index b1dc31159af3..b1dc31159af3 100644
--- a/test/inc/test/sheet/xdatapilottable2.hxx
+++ b/include/test/sheet/xdatapilottable2.hxx
diff --git a/test/inc/test/sheet/xgoalseek.hxx b/include/test/sheet/xgoalseek.hxx
index 71fce12a356b..71fce12a356b 100644
--- a/test/inc/test/sheet/xgoalseek.hxx
+++ b/include/test/sheet/xgoalseek.hxx
diff --git a/test/inc/test/sheet/xnamedrange.hxx b/include/test/sheet/xnamedrange.hxx
index 97a6afdf4926..97a6afdf4926 100644
--- a/test/inc/test/sheet/xnamedrange.hxx
+++ b/include/test/sheet/xnamedrange.hxx
diff --git a/test/inc/test/sheet/xnamedranges.hxx b/include/test/sheet/xnamedranges.hxx
index d0d2eeedb66f..d0d2eeedb66f 100644
--- a/test/inc/test/sheet/xnamedranges.hxx
+++ b/include/test/sheet/xnamedranges.hxx
diff --git a/test/inc/test/sheet/xprintareas.hxx b/include/test/sheet/xprintareas.hxx
index 08f534877690..08f534877690 100644
--- a/test/inc/test/sheet/xprintareas.hxx
+++ b/include/test/sheet/xprintareas.hxx
diff --git a/test/inc/test/sheet/xsheetannotation.hxx b/include/test/sheet/xsheetannotation.hxx
index 9dd552d2803d..9dd552d2803d 100644
--- a/test/inc/test/sheet/xsheetannotation.hxx
+++ b/include/test/sheet/xsheetannotation.hxx
diff --git a/test/inc/test/sheet/xsheetannotations.hxx b/include/test/sheet/xsheetannotations.hxx
index 9c1c2111008c..9c1c2111008c 100644
--- a/test/inc/test/sheet/xsheetannotations.hxx
+++ b/include/test/sheet/xsheetannotations.hxx
diff --git a/test/inc/test/sheet/xsheetoutline.hxx b/include/test/sheet/xsheetoutline.hxx
index b52ac0eeb7aa..b52ac0eeb7aa 100644
--- a/test/inc/test/sheet/xsheetoutline.hxx
+++ b/include/test/sheet/xsheetoutline.hxx
diff --git a/test/inc/test/sheet/xspreadsheetdocument.hxx b/include/test/sheet/xspreadsheetdocument.hxx
index edeef9c4891c..edeef9c4891c 100644
--- a/test/inc/test/sheet/xspreadsheetdocument.hxx
+++ b/include/test/sheet/xspreadsheetdocument.hxx
diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/include/test/sheet/xspreadsheets2.hxx
index 83b9eddd15e7..83b9eddd15e7 100644
--- a/test/inc/test/sheet/xspreadsheets2.hxx
+++ b/include/test/sheet/xspreadsheets2.hxx
diff --git a/test/inc/test/testdllapi.hxx b/include/test/testdllapi.hxx
index 83f49645bb84..83f49645bb84 100644
--- a/test/inc/test/testdllapi.hxx
+++ b/include/test/testdllapi.hxx
diff --git a/test/inc/test/text/xtext.hxx b/include/test/text/xtext.hxx
index 2afee6cdcaec..2afee6cdcaec 100644
--- a/test/inc/test/text/xtext.hxx
+++ b/include/test/text/xtext.hxx
diff --git a/test/inc/test/text/xtextcontent.hxx b/include/test/text/xtextcontent.hxx
index 80549b09655c..80549b09655c 100644
--- a/test/inc/test/text/xtextcontent.hxx
+++ b/include/test/text/xtextcontent.hxx
diff --git a/test/inc/test/text/xtextfield.hxx b/include/test/text/xtextfield.hxx
index 508a622724cf..508a622724cf 100644
--- a/test/inc/test/text/xtextfield.hxx
+++ b/include/test/text/xtextfield.hxx
diff --git a/test/inc/test/unoapi_test.hxx b/include/test/unoapi_test.hxx
index 171e47aa785d..171e47aa785d 100644
--- a/test/inc/test/unoapi_test.hxx
+++ b/include/test/unoapi_test.hxx
diff --git a/test/inc/test/util/xreplaceable.hxx b/include/test/util/xreplaceable.hxx
index 34b56b24514c..34b56b24514c 100644
--- a/test/inc/test/util/xreplaceable.hxx
+++ b/include/test/util/xreplaceable.hxx
diff --git a/test/inc/test/util/xsearchable.hxx b/include/test/util/xsearchable.hxx
index 975ebb2a4a79..975ebb2a4a79 100644
--- a/test/inc/test/util/xsearchable.hxx
+++ b/include/test/util/xsearchable.hxx
diff --git a/test/inc/test/xmldiff.hxx b/include/test/xmldiff.hxx
index 93d09f2e85f4..93d09f2e85f4 100644
--- a/test/inc/test/xmldiff.hxx
+++ b/include/test/xmldiff.hxx
diff --git a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 9e22d41a948b..9e22d41a948b 100644
--- a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
diff --git a/toolkit/inc/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 29651938806f..29651938806f 100644
--- a/toolkit/inc/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 379dbb5b7c8a..379dbb5b7c8a 100644
--- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
index a8893040392d..a8893040392d 100644
--- a/toolkit/inc/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 0b4b0be97127..0b4b0be97127 100644
--- a/toolkit/inc/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index eb48f97d9ba6..eb48f97d9ba6 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index bb385f223ef6..bb385f223ef6 100644
--- a/toolkit/inc/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index a99e19fcd940..a99e19fcd940 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 495e8982ba94..495e8982ba94 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index 56e25bbdd4ce..56e25bbdd4ce 100644
--- a/toolkit/inc/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index ca14b2d35f67..ca14b2d35f67 100644
--- a/toolkit/inc/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index aa0710425422..aa0710425422 100644
--- a/toolkit/inc/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index f1abf21f77f2..f1abf21f77f2 100644
--- a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index ebb4d2408942..ebb4d2408942 100644
--- a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index af55ed3d6ab4..af55ed3d6ab4 100644
--- a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx b/include/toolkit/awt/vclxtabpagemodel.hxx
index 091c5592a765..091c5592a765 100644
--- a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx
+++ b/include/toolkit/awt/vclxtabpagemodel.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/include/toolkit/awt/vclxtoolkit.hxx
index 00045968ac27..00045968ac27 100644
--- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
+++ b/include/toolkit/awt/vclxtoolkit.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 95a742572b94..95a742572b94 100644
--- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 7e415f21a8fd..7e415f21a8fd 100644
--- a/toolkit/inc/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index f822b0cc0e33..f822b0cc0e33 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx
index 3ab8499d63fc..3ab8499d63fc 100644
--- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
+++ b/include/toolkit/awt/xsimpleanimation.hxx
diff --git a/toolkit/inc/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx
index 2c8ad5d0817e..2c8ad5d0817e 100644
--- a/toolkit/inc/toolkit/awt/xthrobber.hxx
+++ b/include/toolkit/awt/xthrobber.hxx
diff --git a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index dedc5bcd842d..dedc5bcd842d 100644
--- a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index dd0757a3e5a1..dd0757a3e5a1 100644
--- a/toolkit/inc/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index e84ddd1f0380..e84ddd1f0380 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index e8b95647c80f..e8b95647c80f 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index 800ccdf35646..800ccdf35646 100644
--- a/toolkit/inc/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index ff5c5de51618..ff5c5de51618 100644
--- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 2ed98907f796..2ed98907f796 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
index 658c7410c910..658c7410c910 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index 1149f00e3056..1149f00e3056 100644
--- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index d6a7a25be877..d6a7a25be877 100644
--- a/toolkit/inc/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.hxx
diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/include/toolkit/controls/spinningprogress.hxx
index 819749e0f28e..819749e0f28e 100644
--- a/toolkit/inc/toolkit/controls/spinningprogress.hxx
+++ b/include/toolkit/controls/spinningprogress.hxx
diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index dd54c9521b47..dd54c9521b47 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 06134170e556..06134170e556 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index 622da638f851..622da638f851 100644
--- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 63684751fe4d..63684751fe4d 100644
--- a/toolkit/inc/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index b6e59119b2f1..b6e59119b2f1 100644
--- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.hxx
diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx
index 8604097567c3..8604097567c3 100644
--- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
+++ b/include/toolkit/controls/tksimpleanimation.hxx
diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/include/toolkit/controls/tkspinbutton.hxx
index ff134d292a98..ff134d292a98 100644
--- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx
+++ b/include/toolkit/controls/tkspinbutton.hxx
diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx
index 24868600aaaf..24868600aaaf 100644
--- a/toolkit/inc/toolkit/controls/tkthrobber.hxx
+++ b/include/toolkit/controls/tkthrobber.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index df5806be7e49..df5806be7e49 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 30f1bf664206..30f1bf664206 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index d4595459dfaf..d4595459dfaf 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index bd5802c3993b..bd5802c3993b 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 397a4df497c4..397a4df497c4 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 0d3119fd8025..0d3119fd8025 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
diff --git a/toolkit/inc/toolkit/dllapi.h b/include/toolkit/dllapi.h
index bf5615cb3547..bf5615cb3547 100644
--- a/toolkit/inc/toolkit/dllapi.h
+++ b/include/toolkit/dllapi.h
diff --git a/toolkit/inc/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx
index 02e44e6c47e8..02e44e6c47e8 100644
--- a/toolkit/inc/toolkit/helper/accessibilityclient.hxx
+++ b/include/toolkit/helper/accessibilityclient.hxx
diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 66117a6bdbba..66117a6bdbba 100644
--- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
diff --git a/toolkit/inc/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx
index 27ad9aa17a0e..27ad9aa17a0e 100644
--- a/toolkit/inc/toolkit/helper/convert.hxx
+++ b/include/toolkit/helper/convert.hxx
diff --git a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx
index 3110d8195f5a..3110d8195f5a 100644
--- a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
+++ b/include/toolkit/helper/emptyfontdescriptor.hxx
diff --git a/toolkit/inc/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx
index 5b0421d558e2..5b0421d558e2 100644
--- a/toolkit/inc/toolkit/helper/externallock.hxx
+++ b/include/toolkit/helper/externallock.hxx
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 9e88d71f5b3f..9e88d71f5b3f 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
diff --git a/toolkit/inc/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx
index f6f2ac5e3860..f6f2ac5e3860 100644
--- a/toolkit/inc/toolkit/helper/imagealign.hxx
+++ b/include/toolkit/helper/imagealign.hxx
diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index dc0626893e37..dc0626893e37 100644
--- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 7d2eaea67403..7d2eaea67403 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/include/toolkit/helper/mutexandbroadcasthelper.hxx
index f887e018452d..f887e018452d 100644
--- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/include/toolkit/helper/mutexandbroadcasthelper.hxx
diff --git a/toolkit/inc/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx
index 85f98635ab73..85f98635ab73 100644
--- a/toolkit/inc/toolkit/helper/mutexhelper.hxx
+++ b/include/toolkit/helper/mutexhelper.hxx
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx
index fa1fbbf2a125..fa1fbbf2a125 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index 5105fc12484b..5105fc12484b 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
diff --git a/toolkit/inc/toolkit/helper/tkresmgr.hxx b/include/toolkit/helper/tkresmgr.hxx
index 362220aa0393..362220aa0393 100644
--- a/toolkit/inc/toolkit/helper/tkresmgr.hxx
+++ b/include/toolkit/helper/tkresmgr.hxx
diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx
index b46dcfe9bc99..b46dcfe9bc99 100644
--- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/include/toolkit/helper/unopropertyarrayhelper.hxx
diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx
index a0b82f4c175d..a0b82f4c175d 100644
--- a/toolkit/inc/toolkit/helper/unowrapper.hxx
+++ b/include/toolkit/helper/unowrapper.hxx
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index cb1da9ffe4d2..cb1da9ffe4d2 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
diff --git a/include/toolkit/unohlp.hxx b/include/toolkit/unohlp.hxx
new file mode 100644
index 000000000000..eb3bd19f1fe5
--- /dev/null
+++ b/include/toolkit/unohlp.hxx
@@ -0,0 +1,3 @@
+// ah, yes: thats a sane thing to do -- deliver the same header _twice_ with different names
+// please kill me (this file)!
+#include <toolkit/helper/vclunohelper.hxx>
diff --git a/tools/inc/tools/StringListResource.hxx b/include/tools/StringListResource.hxx
index 52f22e48a8ef..52f22e48a8ef 100644
--- a/tools/inc/tools/StringListResource.hxx
+++ b/include/tools/StringListResource.hxx
diff --git a/tools/inc/tools/appendunixshellword.hxx b/include/tools/appendunixshellword.hxx
index 98fcdf8023a5..98fcdf8023a5 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/include/tools/appendunixshellword.hxx
diff --git a/tools/inc/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index c9e65950b1b6..c9e65950b1b6 100644
--- a/tools/inc/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
diff --git a/tools/inc/tools/bigint.hxx b/include/tools/bigint.hxx
index d3a2c2f2cff5..d3a2c2f2cff5 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
diff --git a/tools/inc/tools/cachestr.hxx b/include/tools/cachestr.hxx
index 60c31e298cf8..60c31e298cf8 100644
--- a/tools/inc/tools/cachestr.hxx
+++ b/include/tools/cachestr.hxx
diff --git a/tools/inc/tools/color.hxx b/include/tools/color.hxx
index 911088b9cad1..911088b9cad1 100644
--- a/tools/inc/tools/color.hxx
+++ b/include/tools/color.hxx
diff --git a/tools/inc/tools/config.hxx b/include/tools/config.hxx
index 1e73d32b5a33..1e73d32b5a33 100644
--- a/tools/inc/tools/config.hxx
+++ b/include/tools/config.hxx
diff --git a/tools/inc/tools/contnr.hxx b/include/tools/contnr.hxx
index 5b31f6897d77..5b31f6897d77 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/include/tools/contnr.hxx
diff --git a/tools/inc/tools/date.hxx b/include/tools/date.hxx
index 22586c4aaf47..22586c4aaf47 100644
--- a/tools/inc/tools/date.hxx
+++ b/include/tools/date.hxx
diff --git a/tools/inc/tools/datetime.hxx b/include/tools/datetime.hxx
index 1de0f3d6432c..1de0f3d6432c 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/include/tools/datetime.hxx
diff --git a/tools/inc/tools/debug.hxx b/include/tools/debug.hxx
index 54160502257a..54160502257a 100644
--- a/tools/inc/tools/debug.hxx
+++ b/include/tools/debug.hxx
diff --git a/tools/inc/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 261c0aecaf6d..261c0aecaf6d 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
diff --git a/tools/inc/tools/errcode.hxx b/include/tools/errcode.hxx
index 884e9f09748e..884e9f09748e 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/include/tools/errcode.hxx
diff --git a/tools/inc/tools/errinf.hxx b/include/tools/errinf.hxx
index 815447b7372f..815447b7372f 100644
--- a/tools/inc/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/include/tools/extendapplicationenvironment.hxx
index b6ccbf8d5491..b6ccbf8d5491 100644
--- a/tools/inc/tools/extendapplicationenvironment.hxx
+++ b/include/tools/extendapplicationenvironment.hxx
diff --git a/tools/inc/tools/fldunit.hxx b/include/tools/fldunit.hxx
index 2b4a9158dfec..2b4a9158dfec 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/include/tools/fldunit.hxx
diff --git a/tools/inc/tools/fontenum.hxx b/include/tools/fontenum.hxx
index 7a53e931cc1c..7a53e931cc1c 100644
--- a/tools/inc/tools/fontenum.hxx
+++ b/include/tools/fontenum.hxx
diff --git a/tools/inc/tools/fract.hxx b/include/tools/fract.hxx
index 24c6721f0fa3..24c6721f0fa3 100644
--- a/tools/inc/tools/fract.hxx
+++ b/include/tools/fract.hxx
diff --git a/tools/inc/tools/gen.hxx b/include/tools/gen.hxx
index c1a1e359bccc..c1a1e359bccc 100644
--- a/tools/inc/tools/gen.hxx
+++ b/include/tools/gen.hxx
diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/include/tools/getprocessworkingdir.hxx
index f780c86c9a21..f780c86c9a21 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/include/tools/getprocessworkingdir.hxx
diff --git a/tools/inc/tools/globname.hxx b/include/tools/globname.hxx
index 2ea6850801d1..2ea6850801d1 100644
--- a/tools/inc/tools/globname.hxx
+++ b/include/tools/globname.hxx
diff --git a/tools/inc/tools/helpers.hxx b/include/tools/helpers.hxx
index 5a525872ae50..5a525872ae50 100644
--- a/tools/inc/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
diff --git a/tools/inc/tools/inetmime.hxx b/include/tools/inetmime.hxx
index afe4247c6612..afe4247c6612 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
diff --git a/tools/inc/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 395286a04db2..395286a04db2 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
diff --git a/tools/inc/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index d7b4e149d798..d7b4e149d798 100644
--- a/tools/inc/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
diff --git a/tools/inc/tools/line.hxx b/include/tools/line.hxx
index e1b62ffd00f8..e1b62ffd00f8 100644
--- a/tools/inc/tools/line.hxx
+++ b/include/tools/line.hxx
diff --git a/tools/inc/tools/lineend.hxx b/include/tools/lineend.hxx
index c24e91cf83d8..c24e91cf83d8 100644
--- a/tools/inc/tools/lineend.hxx
+++ b/include/tools/lineend.hxx
diff --git a/tools/inc/tools/link.hxx b/include/tools/link.hxx
index c325b67bae76..c325b67bae76 100644
--- a/tools/inc/tools/link.hxx
+++ b/include/tools/link.hxx
diff --git a/tools/inc/tools/mapunit.hxx b/include/tools/mapunit.hxx
index 55d68911b957..55d68911b957 100644
--- a/tools/inc/tools/mapunit.hxx
+++ b/include/tools/mapunit.hxx
diff --git a/tools/inc/tools/mempool.hxx b/include/tools/mempool.hxx
index 3fa27ff50773..3fa27ff50773 100644
--- a/tools/inc/tools/mempool.hxx
+++ b/include/tools/mempool.hxx
diff --git a/tools/inc/tools/multisel.hxx b/include/tools/multisel.hxx
index 678fc94a998a..678fc94a998a 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
diff --git a/tools/inc/tools/pathutils.hxx b/include/tools/pathutils.hxx
index 2153db7c7c3f..2153db7c7c3f 100644
--- a/tools/inc/tools/pathutils.hxx
+++ b/include/tools/pathutils.hxx
diff --git a/tools/inc/tools/poly.hxx b/include/tools/poly.hxx
index 980840f66008..980840f66008 100644
--- a/tools/inc/tools/poly.hxx
+++ b/include/tools/poly.hxx
diff --git a/tools/inc/tools/postsys.h b/include/tools/postsys.h
index 3c3431e50b8d..3c3431e50b8d 100644
--- a/tools/inc/tools/postsys.h
+++ b/include/tools/postsys.h
diff --git a/tools/inc/tools/presys.h b/include/tools/presys.h
index 521768685aa9..521768685aa9 100644
--- a/tools/inc/tools/presys.h
+++ b/include/tools/presys.h
diff --git a/tools/inc/tools/pstm.hxx b/include/tools/pstm.hxx
index 6f971ca7014a..6f971ca7014a 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
diff --git a/tools/inc/tools/rc.h b/include/tools/rc.h
index 5bcd4cb7f3b7..5bcd4cb7f3b7 100644
--- a/tools/inc/tools/rc.h
+++ b/include/tools/rc.h
diff --git a/tools/inc/tools/rc.hxx b/include/tools/rc.hxx
index a043db47d4d5..a043db47d4d5 100644
--- a/tools/inc/tools/rc.hxx
+++ b/include/tools/rc.hxx
diff --git a/tools/inc/tools/rcid.h b/include/tools/rcid.h
index d257639a99f8..d257639a99f8 100644
--- a/tools/inc/tools/rcid.h
+++ b/include/tools/rcid.h
diff --git a/tools/inc/tools/ref.hxx b/include/tools/ref.hxx
index ac7a42bc2e3e..ac7a42bc2e3e 100644
--- a/tools/inc/tools/ref.hxx
+++ b/include/tools/ref.hxx
diff --git a/tools/inc/tools/resary.hxx b/include/tools/resary.hxx
index 515dd779120b..515dd779120b 100644
--- a/tools/inc/tools/resary.hxx
+++ b/include/tools/resary.hxx
diff --git a/tools/inc/tools/resid.hxx b/include/tools/resid.hxx
index 14c0a11915f7..14c0a11915f7 100644
--- a/tools/inc/tools/resid.hxx
+++ b/include/tools/resid.hxx
diff --git a/tools/inc/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 603a2c7a2eb5..603a2c7a2eb5 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
diff --git a/tools/inc/tools/rtti.hxx b/include/tools/rtti.hxx
index a3501b75459b..a3501b75459b 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
diff --git a/tools/inc/tools/shl.hxx b/include/tools/shl.hxx
index 945921fa114a..945921fa114a 100644
--- a/tools/inc/tools/shl.hxx
+++ b/include/tools/shl.hxx
diff --git a/tools/inc/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 667454c6150c..667454c6150c 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
diff --git a/tools/inc/tools/solar.h b/include/tools/solar.h
index 58d5849c5f42..58d5849c5f42 100644
--- a/tools/inc/tools/solar.h
+++ b/include/tools/solar.h
diff --git a/tools/inc/tools/solarmutex.hxx b/include/tools/solarmutex.hxx
index 1d6b13c59655..1d6b13c59655 100644
--- a/tools/inc/tools/solarmutex.hxx
+++ b/include/tools/solarmutex.hxx
diff --git a/tools/inc/tools/stream.hxx b/include/tools/stream.hxx
index 78a0bc3df96f..78a0bc3df96f 100644
--- a/tools/inc/tools/stream.hxx
+++ b/include/tools/stream.hxx
diff --git a/tools/inc/tools/string.hxx b/include/tools/string.hxx
index 5efcd3e3d933..5efcd3e3d933 100644
--- a/tools/inc/tools/string.hxx
+++ b/include/tools/string.hxx
diff --git a/tools/inc/tools/svborder.hxx b/include/tools/svborder.hxx
index de4a8666cbd8..de4a8666cbd8 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/include/tools/svborder.hxx
diff --git a/tools/inc/tools/tempfile.hxx b/include/tools/tempfile.hxx
index 8ef8c574cf7c..8ef8c574cf7c 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/include/tools/tempfile.hxx
diff --git a/tools/inc/tools/tenccvt.hxx b/include/tools/tenccvt.hxx
index 9cae3a79927f..9cae3a79927f 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/include/tools/tenccvt.hxx
diff --git a/tools/inc/tools/time.hxx b/include/tools/time.hxx
index 64751af42284..64751af42284 100644
--- a/tools/inc/tools/time.hxx
+++ b/include/tools/time.hxx
diff --git a/tools/inc/tools/tools.h b/include/tools/tools.h
index c015042d6d42..c015042d6d42 100644
--- a/tools/inc/tools/tools.h
+++ b/include/tools/tools.h
diff --git a/tools/inc/tools/toolsdllapi.h b/include/tools/toolsdllapi.h
index 6e72930e3bc0..6e72930e3bc0 100644
--- a/tools/inc/tools/toolsdllapi.h
+++ b/include/tools/toolsdllapi.h
diff --git a/tools/inc/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 3a3ba979d092..3a3ba979d092 100644
--- a/tools/inc/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
diff --git a/tools/inc/tools/urlobj.hxx b/include/tools/urlobj.hxx
index fef9f469c359..fef9f469c359 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
diff --git a/tools/inc/tools/vcompat.hxx b/include/tools/vcompat.hxx
index cb3c29701e36..cb3c29701e36 100644
--- a/tools/inc/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
diff --git a/tools/inc/tools/vector2d.hxx b/include/tools/vector2d.hxx
index d3d1c5c0c805..d3d1c5c0c805 100644
--- a/tools/inc/tools/vector2d.hxx
+++ b/include/tools/vector2d.hxx
diff --git a/tools/inc/tools/weakbase.h b/include/tools/weakbase.h
index a4ce1d0962e8..a4ce1d0962e8 100644
--- a/tools/inc/tools/weakbase.h
+++ b/include/tools/weakbase.h
diff --git a/tools/inc/tools/weakbase.hxx b/include/tools/weakbase.hxx
index 08e85e17d69b..08e85e17d69b 100644
--- a/tools/inc/tools/weakbase.hxx
+++ b/include/tools/weakbase.hxx
diff --git a/tools/inc/tools/wintypes.hxx b/include/tools/wintypes.hxx
index acd1162ac4e3..acd1162ac4e3 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
diff --git a/tools/inc/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 8991b8882474..8991b8882474 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
diff --git a/tools/inc/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 185cb1d9ecb0..185cb1d9ecb0 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
diff --git a/touch/inc/touch/touch.h b/include/touch/touch.h
index 8fa2dd16d26c..8fa2dd16d26c 100644
--- a/touch/inc/touch/touch.h
+++ b/include/touch/touch.h
diff --git a/tubes/inc/tubes/collaboration.hxx b/include/tubes/collaboration.hxx
index 3f32d4188dbe..3f32d4188dbe 100644
--- a/tubes/inc/tubes/collaboration.hxx
+++ b/include/tubes/collaboration.hxx
diff --git a/tubes/inc/tubes/conference.hxx b/include/tubes/conference.hxx
index 7dfd744d959a..7dfd744d959a 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/include/tubes/conference.hxx
diff --git a/tubes/inc/tubes/constants.h b/include/tubes/constants.h
index 5c34534c8e37..5c34534c8e37 100644
--- a/tubes/inc/tubes/constants.h
+++ b/include/tubes/constants.h
diff --git a/tubes/inc/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h
index 016aed8fdec7..016aed8fdec7 100644
--- a/tubes/inc/tubes/file-transfer-helper.h
+++ b/include/tubes/file-transfer-helper.h
diff --git a/tubes/inc/tubes/manager.hxx b/include/tubes/manager.hxx
index e906e9fd7dd0..e906e9fd7dd0 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/include/tubes/manager.hxx
diff --git a/tubes/inc/tubes/tubesdllapi.h b/include/tubes/tubesdllapi.h
index ea1b70770277..ea1b70770277 100644
--- a/tubes/inc/tubes/tubesdllapi.h
+++ b/include/tubes/tubesdllapi.h
diff --git a/ucbhelper/inc/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index f58fef55a4c9..f58fef55a4c9 100644
--- a/ucbhelper/inc/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
diff --git a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 2f84ff7543e0..2f84ff7543e0 100644
--- a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index 67e000b33fb3..67e000b33fb3 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 01883eee335e..01883eee335e 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 0c5a2b45db5b..0c5a2b45db5b 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index e903d97f193a..e903d97f193a 100644
--- a/ucbhelper/inc/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 4aa5459806f1..4aa5459806f1 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 347c86304359..347c86304359 100644
--- a/ucbhelper/inc/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
diff --git a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index df3d6e386b67..df3d6e386b67 100644
--- a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx
index 052a7413bf93..052a7413bf93 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/include/ucbhelper/fileidentifierconverter.hxx
diff --git a/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx
index 5d25e6cf8e9b..5d25e6cf8e9b 100644
--- a/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx
+++ b/include/ucbhelper/getcomponentcontext.hxx
diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 6de19931238c..6de19931238c 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 8c9b52239ad6..8c9b52239ad6 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 2f31e3098545..2f31e3098545 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 91459e828ef3..91459e828ef3 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 827d5c8379b2..827d5c8379b2 100644
--- a/ucbhelper/inc/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx
index e3ec58180a00..e3ec58180a00 100644
--- a/ucbhelper/inc/ucbhelper/proxydecider.hxx
+++ b/include/ucbhelper/proxydecider.hxx
diff --git a/ucbhelper/inc/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx
index ab241a2f9cb4..ab241a2f9cb4 100644
--- a/ucbhelper/inc/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 531955124f2b..531955124f2b 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 80dd0581652d..80dd0581652d 100644
--- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 35996657553a..35996657553a 100644
--- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx
index 7a084265003c..7a084265003c 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/include/ucbhelper/simpleauthenticationrequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx
index 3f761153582b..3f761153582b 100644
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx
index 746aaf284bd6..746aaf284bd6 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/include/ucbhelper/simpleinteractionrequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/include/ucbhelper/simpleioerrorrequest.hxx
index d4c9c5277316..d4c9c5277316 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/include/ucbhelper/simpleioerrorrequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx
index be789fd6a148..be789fd6a148 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/include/ucbhelper/simplenameclashresolverequest.hxx
diff --git a/ucbhelper/inc/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx
index 92c9577519bc..92c9577519bc 100644
--- a/ucbhelper/inc/ucbhelper/std_inputstream.hxx
+++ b/include/ucbhelper/std_inputstream.hxx
diff --git a/ucbhelper/inc/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx
index d0ad4a660248..d0ad4a660248 100644
--- a/ucbhelper/inc/ucbhelper/std_outputstream.hxx
+++ b/include/ucbhelper/std_outputstream.hxx
diff --git a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h
index b129f163de8f..b129f163de8f 100644
--- a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
+++ b/include/ucbhelper/ucbhelperdllapi.h
diff --git a/udm/inc/udm/html/htmlitem.hxx b/include/udm/html/htmlitem.hxx
index 1750f5f0cb6a..1750f5f0cb6a 100644
--- a/udm/inc/udm/html/htmlitem.hxx
+++ b/include/udm/html/htmlitem.hxx
diff --git a/udm/inc/udm/xml/xmlitem.hxx b/include/udm/xml/xmlitem.hxx
index eab5798feca0..eab5798feca0 100644
--- a/udm/inc/udm/xml/xmlitem.hxx
+++ b/include/udm/xml/xmlitem.hxx
diff --git a/unoidl/inc/unoidl/detail/dllapi.hxx b/include/unoidl/detail/dllapi.hxx
index ad011ad4eb77..ad011ad4eb77 100644
--- a/unoidl/inc/unoidl/detail/dllapi.hxx
+++ b/include/unoidl/detail/dllapi.hxx
diff --git a/unoidl/inc/unoidl/detail/unoidldllapi.hxx b/include/unoidl/detail/unoidldllapi.hxx
index cfb1e90fd488..cfb1e90fd488 100644
--- a/unoidl/inc/unoidl/detail/unoidldllapi.hxx
+++ b/include/unoidl/detail/unoidldllapi.hxx
diff --git a/unoidl/inc/unoidl/legacyprovider.hxx b/include/unoidl/legacyprovider.hxx
index cebdc1f764ea..cebdc1f764ea 100644
--- a/unoidl/inc/unoidl/legacyprovider.hxx
+++ b/include/unoidl/legacyprovider.hxx
diff --git a/unoidl/inc/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 9d774473c7ee..9d774473c7ee 100644
--- a/unoidl/inc/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
diff --git a/unoidl/inc/unoidl/unoidlprovider.hxx b/include/unoidl/unoidlprovider.hxx
index d7d4fbb97f8c..d7d4fbb97f8c 100644
--- a/unoidl/inc/unoidl/unoidlprovider.hxx
+++ b/include/unoidl/unoidlprovider.hxx
diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index 3753350f7e21..3753350f7e21 100644
--- a/unotest/inc/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
diff --git a/unotest/inc/unotest/detail/unotestdllapi.hxx b/include/unotest/detail/unotestdllapi.hxx
index fb850650713f..fb850650713f 100644
--- a/unotest/inc/unotest/detail/unotestdllapi.hxx
+++ b/include/unotest/detail/unotestdllapi.hxx
diff --git a/unotest/inc/unotest/filters-test.hxx b/include/unotest/filters-test.hxx
index 7b080c223a11..7b080c223a11 100644
--- a/unotest/inc/unotest/filters-test.hxx
+++ b/include/unotest/filters-test.hxx
diff --git a/unotest/inc/unotest/gettestargument.hxx b/include/unotest/gettestargument.hxx
index 3364c5666600..3364c5666600 100644
--- a/unotest/inc/unotest/gettestargument.hxx
+++ b/include/unotest/gettestargument.hxx
diff --git a/unotest/inc/unotest/macros_test.hxx b/include/unotest/macros_test.hxx
index f771a6f33634..f771a6f33634 100644
--- a/unotest/inc/unotest/macros_test.hxx
+++ b/include/unotest/macros_test.hxx
diff --git a/unotest/inc/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx
index edef6628ab3a..edef6628ab3a 100644
--- a/unotest/inc/unotest/officeconnection.hxx
+++ b/include/unotest/officeconnection.hxx
diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/include/unotest/toabsolutefileurl.hxx
index 1f68c665ed33..1f68c665ed33 100644
--- a/unotest/inc/unotest/toabsolutefileurl.hxx
+++ b/include/unotest/toabsolutefileurl.hxx
diff --git a/unotest/inc/unotest/uniquepipename.hxx b/include/unotest/uniquepipename.hxx
index 732856228d6a..732856228d6a 100644
--- a/unotest/inc/unotest/uniquepipename.hxx
+++ b/include/unotest/uniquepipename.hxx
diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 18e9a80a639a..18e9a80a639a 100644
--- a/unotools/inc/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 7652a03cc47c..7652a03cc47c 100644
--- a/unotools/inc/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
diff --git a/unotools/inc/unotools/atom.hxx b/include/unotools/atom.hxx
index 5b8f193d604f..5b8f193d604f 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
diff --git a/unotools/inc/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index 530fa3173b73..530fa3173b73 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index d7e66dea0f33..d7e66dea0f33 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
diff --git a/unotools/inc/unotools/caserotate.hxx b/include/unotools/caserotate.hxx
index d62878db2592..d62878db2592 100644
--- a/unotools/inc/unotools/caserotate.hxx
+++ b/include/unotools/caserotate.hxx
diff --git a/unotools/inc/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 6ea11f62063d..6ea11f62063d 100644
--- a/unotools/inc/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
diff --git a/unotools/inc/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index 21d381c5094b..21d381c5094b 100644
--- a/unotools/inc/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
diff --git a/unotools/inc/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index 173b7b585643..173b7b585643 100644
--- a/unotools/inc/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index c73be3518569..c73be3518569 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
diff --git a/unotools/inc/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 16c73dbc3215..16c73dbc3215 100644
--- a/unotools/inc/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
diff --git a/unotools/inc/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index 0014794f3584..0014794f3584 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
diff --git a/unotools/inc/unotools/configitem.hxx b/include/unotools/configitem.hxx
index d9f7675a185e..d9f7675a185e 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
diff --git a/unotools/inc/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index f5964a505cf4..f5964a505cf4 100644
--- a/unotools/inc/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
diff --git a/unotools/inc/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 4e663dd25bbb..4e663dd25bbb 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
diff --git a/unotools/inc/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index d3e400ae1158..d3e400ae1158 100644
--- a/unotools/inc/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 2fa95c337bd0..2fa95c337bd0 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
diff --git a/unotools/inc/unotools/datetime.hxx b/include/unotools/datetime.hxx
index dfc0ab139825..dfc0ab139825 100644
--- a/unotools/inc/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
diff --git a/unotools/inc/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index 175fd3239f7a..175fd3239f7a 100644
--- a/unotools/inc/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
diff --git a/unotools/inc/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 0f771669a485..0f771669a485 100644
--- a/unotools/inc/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
diff --git a/unotools/inc/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx
index d7bca117756b..d7bca117756b 100644
--- a/unotools/inc/unotools/digitgroupingiterator.hxx
+++ b/include/unotools/digitgroupingiterator.hxx
diff --git a/unotools/inc/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx
index be32c3bfc7c9..be32c3bfc7c9 100644
--- a/unotools/inc/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 46a8a211531c..46a8a211531c 100644
--- a/unotools/inc/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
diff --git a/unotools/inc/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 2ea72642805a..2ea72642805a 100644
--- a/unotools/inc/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
diff --git a/unotools/inc/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 89fe74782e34..89fe74782e34 100644
--- a/unotools/inc/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
diff --git a/unotools/inc/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 245f87e0d50f..245f87e0d50f 100644
--- a/unotools/inc/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
diff --git a/unotools/inc/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx
index 0356aeeb5d12..0356aeeb5d12 100644
--- a/unotools/inc/unotools/fltrcfg.hxx
+++ b/include/unotools/fltrcfg.hxx
diff --git a/unotools/inc/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index 23ea55140655..23ea55140655 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
diff --git a/unotools/inc/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 05564f974a79..05564f974a79 100644
--- a/unotools/inc/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
diff --git a/unotools/inc/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 60c37d498045..60c37d498045 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
diff --git a/unotools/inc/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index d37423138e00..d37423138e00 100644
--- a/unotools/inc/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
diff --git a/unotools/inc/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 3e1431544049..3e1431544049 100644
--- a/unotools/inc/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
diff --git a/unotools/inc/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
index b96c27e8ac0d..b96c27e8ac0d 100644
--- a/unotools/inc/unotools/idhelper.hxx
+++ b/include/unotools/idhelper.hxx
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 9165be22b414..9165be22b414 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
diff --git a/unotools/inc/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 831cba4a4a72..831cba4a4a72 100644
--- a/unotools/inc/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
diff --git a/unotools/inc/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 1dc24c605702..1dc24c605702 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
diff --git a/unotools/inc/unotools/linguprops.hxx b/include/unotools/linguprops.hxx
index 85cf64b3d31c..85cf64b3d31c 100644
--- a/unotools/inc/unotools/linguprops.hxx
+++ b/include/unotools/linguprops.hxx
diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index a198163831f7..a198163831f7 100644
--- a/unotools/inc/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
diff --git a/unotools/inc/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 4a1864b2f44f..4a1864b2f44f 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
diff --git a/unotools/inc/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index 931d59f1980d..931d59f1980d 100644
--- a/unotools/inc/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.hxx
diff --git a/unotools/inc/unotools/misccfg.hxx b/include/unotools/misccfg.hxx
index 7759b31ed24a..7759b31ed24a 100644
--- a/unotools/inc/unotools/misccfg.hxx
+++ b/include/unotools/misccfg.hxx
diff --git a/unotools/inc/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 75b83b1c0988..75b83b1c0988 100644
--- a/unotools/inc/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 252a48d85a13..252a48d85a13 100644
--- a/unotools/inc/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 82e254e7ea1d..82e254e7ea1d 100644
--- a/unotools/inc/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
diff --git a/unotools/inc/unotools/options.hxx b/include/unotools/options.hxx
index 5a37b026fb63..5a37b026fb63 100644
--- a/unotools/inc/unotools/options.hxx
+++ b/include/unotools/options.hxx
diff --git a/unotools/inc/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index ba28032a49ea..ba28032a49ea 100644
--- a/unotools/inc/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
diff --git a/unotools/inc/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index ad1d16d19c79..ad1d16d19c79 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
diff --git a/unotools/inc/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index 61b79ee2eb45..61b79ee2eb45 100644
--- a/unotools/inc/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
diff --git a/unotools/inc/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index fc640dc4c4a9..fc640dc4c4a9 100644
--- a/unotools/inc/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
diff --git a/unotools/inc/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx
index dd182d1e9a67..dd182d1e9a67 100644
--- a/unotools/inc/unotools/readwritemutexguard.hxx
+++ b/include/unotools/readwritemutexguard.hxx
diff --git a/unotools/inc/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 771c7210d09c..771c7210d09c 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
diff --git a/unotools/inc/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index 0ce76a846024..0ce76a846024 100644
--- a/unotools/inc/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
diff --git a/unotools/inc/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 2156cb5ec3e5..2156cb5ec3e5 100644
--- a/unotools/inc/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 5fa399dbc417..5fa399dbc417 100644
--- a/unotools/inc/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
diff --git a/unotools/inc/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 60e16a28767a..60e16a28767a 100644
--- a/unotools/inc/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
diff --git a/unotools/inc/unotools/streamsection.hxx b/include/unotools/streamsection.hxx
index 8e347eec5d4e..8e347eec5d4e 100644
--- a/unotools/inc/unotools/streamsection.hxx
+++ b/include/unotools/streamsection.hxx
diff --git a/unotools/inc/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 097b3dee94e3..097b3dee94e3 100644
--- a/unotools/inc/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
diff --git a/unotools/inc/unotools/syslocale.hxx b/include/unotools/syslocale.hxx
index d32a22139129..d32a22139129 100644
--- a/unotools/inc/unotools/syslocale.hxx
+++ b/include/unotools/syslocale.hxx
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 8c9378938ce0..8c9378938ce0 100644
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
diff --git a/unotools/inc/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 6cf2cb0cd98c..6cf2cb0cd98c 100644
--- a/unotools/inc/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
diff --git a/unotools/inc/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 0b826102cb91..0b826102cb91 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 6d64d40a92f1..6d64d40a92f1 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
diff --git a/unotools/inc/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index fad06ced5e2d..fad06ced5e2d 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx
index cf5d98b93583..cf5d98b93583 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/include/unotools/ucblockbytes.hxx
diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 85de1f36c741..85de1f36c741 100644
--- a/unotools/inc/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
diff --git a/unotools/inc/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h
index a08f54ce8a5a..a08f54ce8a5a 100644
--- a/unotools/inc/unotools/unotoolsdllapi.h
+++ b/include/unotools/unotoolsdllapi.h
diff --git a/unotools/inc/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 77b71ee90bd1..77b71ee90bd1 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
diff --git a/unotools/inc/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 8c8986dd4b99..8c8986dd4b99 100644
--- a/unotools/inc/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx
index d0e15dcfdbec..d0e15dcfdbec 100644
--- a/unotools/inc/unotools/xmlaccelcfg.hxx
+++ b/include/unotools/xmlaccelcfg.hxx
diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx
index a8a3d75142e0..a8a3d75142e0 100644
--- a/vbahelper/inc/vbahelper/helperdecl.hxx
+++ b/include/vbahelper/helperdecl.hxx
diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx
index 11bbff2426a9..11bbff2426a9 100644
--- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx
index c63bce52c263..c63bce52c263 100644
--- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx
+++ b/include/vbahelper/vbaapplicationbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 780741e06a62..780741e06a62 100644
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx
index bb706cbaf17a..bb706cbaf17a 100644
--- a/vbahelper/inc/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx
index 54c1fd33f107..54c1fd33f107 100644
--- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx
+++ b/include/vbahelper/vbadialogsbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h
index 43beae86b676..43beae86b676 100644
--- a/vbahelper/inc/vbahelper/vbadllapi.h
+++ b/include/vbahelper/vbadllapi.h
diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx
index 77e799078a97..77e799078a97 100644
--- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx
+++ b/include/vbahelper/vbadocumentbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx
index b8386d6e291e..b8386d6e291e 100644
--- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 627970f9f623..627970f9f623 100644
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx
index ddfb30899f82..ddfb30899f82 100644
--- a/vbahelper/inc/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx
index 4c30a26c95c0..4c30a26c95c0 100644
--- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx
+++ b/include/vbahelper/vbaglobalbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index be5d73906c53..be5d73906c53 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx
index a37bb59dc129..a37bb59dc129 100644
--- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx
index b063353af36a..b063353af36a 100644
--- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx
+++ b/include/vbahelper/vbapagesetupbase.hxx
diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx
index 816f93f8c445..816f93f8c445 100644
--- a/vbahelper/inc/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 58e4f2865545..58e4f2865545 100644
--- a/vbahelper/inc/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx
index e1a447ee3dbf..e1a447ee3dbf 100644
--- a/vbahelper/inc/vbahelper/vbashaperange.hxx
+++ b/include/vbahelper/vbashaperange.hxx
diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index 4c4b7c3e5a49..4c4b7c3e5a49 100644
--- a/vbahelper/inc/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx
index d8f44e32c826..d8f44e32c826 100644
--- a/vbahelper/inc/vbahelper/vbatextframe.hxx
+++ b/include/vbahelper/vbatextframe.hxx
diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx
index 33ef793eecd8..33ef793eecd8 100644
--- a/vbahelper/inc/vbahelper/vbawindowbase.hxx
+++ b/include/vbahelper/vbawindowbase.hxx
diff --git a/vcl/inc/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx
index b13f37a19680..b13f37a19680 100644
--- a/vcl/inc/vcl/FilterConfigItem.hxx
+++ b/include/vcl/FilterConfigItem.hxx
diff --git a/vcl/inc/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx
index ab5b767ceb15..ab5b767ceb15 100644
--- a/vcl/inc/vcl/GraphicNativeMetadata.hxx
+++ b/include/vcl/GraphicNativeMetadata.hxx
diff --git a/vcl/inc/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx
index db727a22c5ff..db727a22c5ff 100644
--- a/vcl/inc/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
diff --git a/vcl/inc/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx
index cfbba790850c..cfbba790850c 100644
--- a/vcl/inc/vcl/ImageListProvider.hxx
+++ b/include/vcl/ImageListProvider.hxx
diff --git a/vcl/inc/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 5f92c74d5c08..5f92c74d5c08 100644
--- a/vcl/inc/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
diff --git a/vcl/inc/vcl/accel.hxx b/include/vcl/accel.hxx
index 79136b15b1f8..79136b15b1f8 100644
--- a/vcl/inc/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
diff --git a/vcl/inc/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 95bb0ea29de2..95bb0ea29de2 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
diff --git a/vcl/inc/vcl/animate.hxx b/include/vcl/animate.hxx
index dd374e8aed51..dd374e8aed51 100644
--- a/vcl/inc/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
diff --git a/vcl/inc/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index ebb1eb703212..ebb1eb703212 100644
--- a/vcl/inc/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
diff --git a/vcl/inc/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index c0ec5b17870c..c0ec5b17870c 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
diff --git a/vcl/inc/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 9eaaf618200c..9eaaf618200c 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
diff --git a/vcl/inc/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index 097fd7cf57e3..097fd7cf57e3 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
diff --git a/vcl/inc/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 541109885079..541109885079 100644
--- a/vcl/inc/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
diff --git a/vcl/inc/vcl/builder.hxx b/include/vcl/builder.hxx
index 5de792aaab5e..5de792aaab5e 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
diff --git a/vcl/inc/vcl/button.hxx b/include/vcl/button.hxx
index 8c116b0644dd..8c116b0644dd 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/include/vcl/button.hxx
diff --git a/vcl/inc/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index d4c2246e2544..d4c2246e2544 100644
--- a/vcl/inc/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
diff --git a/vcl/inc/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx
index 03876e52e5a3..03876e52e5a3 100644
--- a/vcl/inc/vcl/cmdevt.hxx
+++ b/include/vcl/cmdevt.hxx
diff --git a/vcl/inc/vcl/combobox.h b/include/vcl/combobox.h
index 4cb8c964ee2e..4cb8c964ee2e 100644
--- a/vcl/inc/vcl/combobox.h
+++ b/include/vcl/combobox.h
diff --git a/vcl/inc/vcl/combobox.hxx b/include/vcl/combobox.hxx
index f0637109716a..f0637109716a 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
diff --git a/vcl/inc/vcl/configsettings.hxx b/include/vcl/configsettings.hxx
index 47c96facd472..47c96facd472 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/include/vcl/configsettings.hxx
diff --git a/vcl/inc/vcl/controllayout.hxx b/include/vcl/controllayout.hxx
index 5d1d13355718..5d1d13355718 100644
--- a/vcl/inc/vcl/controllayout.hxx
+++ b/include/vcl/controllayout.hxx
diff --git a/vcl/inc/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 390f416ae142..390f416ae142 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
diff --git a/vcl/inc/vcl/cursor.hxx b/include/vcl/cursor.hxx
index d0433858c3b3..d0433858c3b3 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
diff --git a/vcl/inc/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index ee9f21870010..ee9f21870010 100644
--- a/vcl/inc/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
diff --git a/vcl/inc/vcl/cvtsvm.hxx b/include/vcl/cvtsvm.hxx
index 2dc9435cdfa9..2dc9435cdfa9 100644
--- a/vcl/inc/vcl/cvtsvm.hxx
+++ b/include/vcl/cvtsvm.hxx
diff --git a/vcl/inc/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 31e6529c5e55..31e6529c5e55 100644
--- a/vcl/inc/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
diff --git a/vcl/inc/vcl/dialog.hxx b/include/vcl/dialog.hxx
index d7994c61580e..d7994c61580e 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
diff --git a/vcl/inc/vcl/displayconnectiondispatch.hxx b/include/vcl/displayconnectiondispatch.hxx
index 06009c15867a..06009c15867a 100644
--- a/vcl/inc/vcl/displayconnectiondispatch.hxx
+++ b/include/vcl/displayconnectiondispatch.hxx
diff --git a/vcl/inc/vcl/dllapi.h b/include/vcl/dllapi.h
index f501125e72f9..f501125e72f9 100644
--- a/vcl/inc/vcl/dllapi.h
+++ b/include/vcl/dllapi.h
diff --git a/vcl/inc/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index 2504f697f2d7..2504f697f2d7 100644
--- a/vcl/inc/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
diff --git a/vcl/inc/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index a5778519e3ae..a5778519e3ae 100644
--- a/vcl/inc/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
diff --git a/vcl/inc/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 19b516b004a3..19b516b004a3 100644
--- a/vcl/inc/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
diff --git a/vcl/inc/vcl/edit.hxx b/include/vcl/edit.hxx
index 488758ab7d4a..488758ab7d4a 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
diff --git a/vcl/inc/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx
index 0b66e8ab157a..0b66e8ab157a 100644
--- a/vcl/inc/vcl/embeddedfontshelper.hxx
+++ b/include/vcl/embeddedfontshelper.hxx
diff --git a/vcl/inc/vcl/event.hxx b/include/vcl/event.hxx
index e89d52ad1e9a..e89d52ad1e9a 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/include/vcl/event.hxx
diff --git a/vcl/inc/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 3116ab7c58b7..3116ab7c58b7 100644
--- a/vcl/inc/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
diff --git a/vcl/inc/vcl/extoutdevdata.hxx b/include/vcl/extoutdevdata.hxx
index 2ee5967c473d..2ee5967c473d 100644
--- a/vcl/inc/vcl/extoutdevdata.hxx
+++ b/include/vcl/extoutdevdata.hxx
diff --git a/vcl/inc/vcl/field.hxx b/include/vcl/field.hxx
index babab8da29d2..babab8da29d2 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/include/vcl/field.hxx
diff --git a/vcl/inc/vcl/fixed.hxx b/include/vcl/fixed.hxx
index b592d98a48d2..b592d98a48d2 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
diff --git a/vcl/inc/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index b43e4bd7fd6e..b43e4bd7fd6e 100644
--- a/vcl/inc/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
diff --git a/vcl/inc/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 4f29b40e01a5..4f29b40e01a5 100644
--- a/vcl/inc/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
diff --git a/vcl/inc/vcl/fltcall.hxx b/include/vcl/fltcall.hxx
index 03a634073d95..03a634073d95 100644
--- a/vcl/inc/vcl/fltcall.hxx
+++ b/include/vcl/fltcall.hxx
diff --git a/vcl/inc/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx
index 5e877b3f28fc..5e877b3f28fc 100644
--- a/vcl/inc/vcl/fntstyle.hxx
+++ b/include/vcl/fntstyle.hxx
diff --git a/vcl/inc/vcl/font.hxx b/include/vcl/font.hxx
index d886d48b9854..d886d48b9854 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/include/vcl/font.hxx
diff --git a/vcl/inc/vcl/fontcapabilities.hxx b/include/vcl/fontcapabilities.hxx
index 5740b96c3411..5740b96c3411 100644
--- a/vcl/inc/vcl/fontcapabilities.hxx
+++ b/include/vcl/fontcapabilities.hxx
diff --git a/vcl/inc/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx
index 05955f984710..05955f984710 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/include/vcl/fontmanager.hxx
diff --git a/vcl/inc/vcl/fpicker.hrc b/include/vcl/fpicker.hrc
index 827d24069101..827d24069101 100644
--- a/vcl/inc/vcl/fpicker.hrc
+++ b/include/vcl/fpicker.hrc
diff --git a/vcl/inc/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index bbdf14177b3b..bbdf14177b3b 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
diff --git a/vcl/inc/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 380298b500b8..380298b500b8 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
diff --git a/vcl/inc/vcl/gradient.hxx b/include/vcl/gradient.hxx
index d9bbf7aea1ad..d9bbf7aea1ad 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
diff --git a/vcl/inc/vcl/graph.h b/include/vcl/graph.h
index 94224b780d93..94224b780d93 100644
--- a/vcl/inc/vcl/graph.h
+++ b/include/vcl/graph.h
diff --git a/vcl/inc/vcl/graph.hxx b/include/vcl/graph.hxx
index 4f1facae5395..4f1facae5395 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
diff --git a/vcl/inc/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8f42119360d1..8f42119360d1 100644
--- a/vcl/inc/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
diff --git a/vcl/inc/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index 3600f1a364fc..3600f1a364fc 100644
--- a/vcl/inc/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
diff --git a/vcl/inc/vcl/group.hxx b/include/vcl/group.hxx
index 647aabe66570..647aabe66570 100644
--- a/vcl/inc/vcl/group.hxx
+++ b/include/vcl/group.hxx
diff --git a/vcl/inc/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 8112fe5d4718..8112fe5d4718 100644
--- a/vcl/inc/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
diff --git a/vcl/inc/vcl/help.hxx b/include/vcl/help.hxx
index b74d8023f75c..b74d8023f75c 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/include/vcl/help.hxx
diff --git a/vcl/inc/vcl/helper.hxx b/include/vcl/helper.hxx
index 295df4a1a5e7..295df4a1a5e7 100644
--- a/vcl/inc/vcl/helper.hxx
+++ b/include/vcl/helper.hxx
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 8ece881a9b03..8ece881a9b03 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
diff --git a/vcl/inc/vcl/image.hxx b/include/vcl/image.hxx
index 0d28bc030abd..0d28bc030abd 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/include/vcl/image.hxx
diff --git a/vcl/inc/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx
index 45ee445edcd6..45ee445edcd6 100644
--- a/vcl/inc/vcl/imagerepository.hxx
+++ b/include/vcl/imagerepository.hxx
diff --git a/vcl/inc/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index d0da64cbe6fa..d0da64cbe6fa 100644
--- a/vcl/inc/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
diff --git a/vcl/inc/vcl/impdel.hxx b/include/vcl/impdel.hxx
index df6e2713196e..df6e2713196e 100644
--- a/vcl/inc/vcl/impdel.hxx
+++ b/include/vcl/impdel.hxx
diff --git a/vcl/inc/vcl/inputctx.hxx b/include/vcl/inputctx.hxx
index 7072f88ab404..7072f88ab404 100644
--- a/vcl/inc/vcl/inputctx.hxx
+++ b/include/vcl/inputctx.hxx
diff --git a/vcl/inc/vcl/introwin.hxx b/include/vcl/introwin.hxx
index d78648cd7ef5..d78648cd7ef5 100644
--- a/vcl/inc/vcl/introwin.hxx
+++ b/include/vcl/introwin.hxx
diff --git a/vcl/inc/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index f6fb94fccab2..f6fb94fccab2 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
diff --git a/vcl/inc/vcl/jobset.hxx b/include/vcl/jobset.hxx
index 15f418cbda3a..15f418cbda3a 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
diff --git a/vcl/inc/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 70df7583bcca..70df7583bcca 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
diff --git a/vcl/inc/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index cfa23649e194..cfa23649e194 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
diff --git a/vcl/inc/vcl/layout.hxx b/include/vcl/layout.hxx
index c6b6a1274fa7..c6b6a1274fa7 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
diff --git a/vcl/inc/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index ee818eef8df8..ee818eef8df8 100644
--- a/vcl/inc/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
diff --git a/vcl/inc/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index d5165a63e016..d5165a63e016 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
diff --git a/vcl/inc/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index b0d57c392ab7..b0d57c392ab7 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
diff --git a/vcl/inc/vcl/lstbox.h b/include/vcl/lstbox.h
index 1d9dd30c809b..1d9dd30c809b 100644
--- a/vcl/inc/vcl/lstbox.h
+++ b/include/vcl/lstbox.h
diff --git a/vcl/inc/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 79026116c473..79026116c473 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
diff --git a/vcl/inc/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index e6f30cf5089e..e6f30cf5089e 100644
--- a/vcl/inc/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
diff --git a/vcl/inc/vcl/menu.hxx b/include/vcl/menu.hxx
index c9bc3b538711..c9bc3b538711 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
diff --git a/vcl/inc/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 4036ee9059b1..4036ee9059b1 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
diff --git a/vcl/inc/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 961baaecd1ff..961baaecd1ff 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
diff --git a/vcl/inc/vcl/metric.hxx b/include/vcl/metric.hxx
index 27108d756d2f..27108d756d2f 100644
--- a/vcl/inc/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
diff --git a/vcl/inc/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index 4ec22b5522a2..4ec22b5522a2 100644
--- a/vcl/inc/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
diff --git a/vcl/inc/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx
index e1def2d8d98e..e1def2d8d98e 100644
--- a/vcl/inc/vcl/mnemonicengine.hxx
+++ b/include/vcl/mnemonicengine.hxx
diff --git a/vcl/inc/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index a715f37357d7..a715f37357d7 100644
--- a/vcl/inc/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
diff --git a/vcl/inc/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 594d248a6acd..594d248a6acd 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
diff --git a/vcl/inc/vcl/octree.hxx b/include/vcl/octree.hxx
index 7d1054db8156..7d1054db8156 100644
--- a/vcl/inc/vcl/octree.hxx
+++ b/include/vcl/octree.hxx
diff --git a/vcl/inc/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx
index adbf49c2dcad..adbf49c2dcad 100644
--- a/vcl/inc/vcl/oldprintadaptor.hxx
+++ b/include/vcl/oldprintadaptor.hxx
diff --git a/vcl/inc/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b0bb8e5c9389..b0bb8e5c9389 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 59a118945cd4..59a118945cd4 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 3bfd5ed2f66f..3bfd5ed2f66f 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
diff --git a/vcl/inc/vcl/pngread.hxx b/include/vcl/pngread.hxx
index b36a0ee6106a..b36a0ee6106a 100644
--- a/vcl/inc/vcl/pngread.hxx
+++ b/include/vcl/pngread.hxx
diff --git a/vcl/inc/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx
index 921ad45ddf4d..921ad45ddf4d 100644
--- a/vcl/inc/vcl/pngwrite.hxx
+++ b/include/vcl/pngwrite.hxx
diff --git a/vcl/inc/vcl/pointr.hxx b/include/vcl/pointr.hxx
index 9cfdd6000371..9cfdd6000371 100644
--- a/vcl/inc/vcl/pointr.hxx
+++ b/include/vcl/pointr.hxx
diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx
index a5856dca4bf9..a5856dca4bf9 100644
--- a/vcl/inc/vcl/popupmenuwindow.hxx
+++ b/include/vcl/popupmenuwindow.hxx
diff --git a/vcl/inc/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index 80fbeaf4728a..80fbeaf4728a 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
diff --git a/vcl/inc/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx
index 9f22df47c7a8..9f22df47c7a8 100644
--- a/vcl/inc/vcl/prgsbar.hxx
+++ b/include/vcl/prgsbar.hxx
diff --git a/vcl/inc/vcl/print.hxx b/include/vcl/print.hxx
index c40e8bc4ab4d..c40e8bc4ab4d 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/include/vcl/print.hxx
diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 108b31504de1..108b31504de1 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
diff --git a/vcl/inc/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index 4fdaaf794f08..4fdaaf794f08 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
diff --git a/vcl/inc/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index c3f567e26036..c3f567e26036 100644
--- a/vcl/inc/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
diff --git a/vcl/inc/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 631f0c40aa95..631f0c40aa95 100644
--- a/vcl/inc/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
diff --git a/vcl/inc/vcl/regband.hxx b/include/vcl/regband.hxx
index 0b60a801d83e..0b60a801d83e 100644
--- a/vcl/inc/vcl/regband.hxx
+++ b/include/vcl/regband.hxx
diff --git a/vcl/inc/vcl/region.hxx b/include/vcl/region.hxx
index 02eebc7ec50e..02eebc7ec50e 100644
--- a/vcl/inc/vcl/region.hxx
+++ b/include/vcl/region.hxx
diff --git a/vcl/inc/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 85a00a197f96..85a00a197f96 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
diff --git a/vcl/inc/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 4fbb65d2a49a..4fbb65d2a49a 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
diff --git a/vcl/inc/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index 25836f508771..25836f508771 100644
--- a/vcl/inc/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 775503e29da4..775503e29da4 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
diff --git a/vcl/inc/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx
index 834f827e14aa..834f827e14aa 100644
--- a/vcl/inc/vcl/scopedbitmapaccess.hxx
+++ b/include/vcl/scopedbitmapaccess.hxx
diff --git a/vcl/inc/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 4a1a164121be..4a1a164121be 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
diff --git a/vcl/inc/vcl/seleng.hxx b/include/vcl/seleng.hxx
index f93e74a3ebf4..f93e74a3ebf4 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
diff --git a/vcl/inc/vcl/settings.hxx b/include/vcl/settings.hxx
index 19dc20f3ba12..19dc20f3ba12 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
diff --git a/vcl/inc/vcl/slider.hxx b/include/vcl/slider.hxx
index 5d02217040b6..5d02217040b6 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
diff --git a/vcl/inc/vcl/solarmutex.hxx b/include/vcl/solarmutex.hxx
index a6880a62995a..a6880a62995a 100644
--- a/vcl/inc/vcl/solarmutex.hxx
+++ b/include/vcl/solarmutex.hxx
diff --git a/vcl/inc/vcl/sound.hxx b/include/vcl/sound.hxx
index 7be53a0944ee..7be53a0944ee 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/include/vcl/sound.hxx
diff --git a/vcl/inc/vcl/spin.h b/include/vcl/spin.h
index 0760b94ee2a5..0760b94ee2a5 100644
--- a/vcl/inc/vcl/spin.h
+++ b/include/vcl/spin.h
diff --git a/vcl/inc/vcl/spin.hxx b/include/vcl/spin.hxx
index 3966034c0938..3966034c0938 100644
--- a/vcl/inc/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
diff --git a/vcl/inc/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 4a902d17aeaa..4a902d17aeaa 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
diff --git a/vcl/inc/vcl/split.hxx b/include/vcl/split.hxx
index 1710ea62f5eb..1710ea62f5eb 100644
--- a/vcl/inc/vcl/split.hxx
+++ b/include/vcl/split.hxx
diff --git a/vcl/inc/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index b723a449f727..b723a449f727 100644
--- a/vcl/inc/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
diff --git a/vcl/inc/vcl/status.hxx b/include/vcl/status.hxx
index 91aa97113179..91aa97113179 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/include/vcl/status.hxx
diff --git a/vcl/inc/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index ab48231d23c2..ab48231d23c2 100644
--- a/vcl/inc/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
diff --git a/vcl/inc/vcl/strhelper.hxx b/include/vcl/strhelper.hxx
index 0d0949a3515f..0d0949a3515f 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/include/vcl/strhelper.hxx
diff --git a/vcl/inc/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b4acc579ad94..b4acc579ad94 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
diff --git a/vcl/inc/vcl/svgdata.hxx b/include/vcl/svgdata.hxx
index dccb08f8c579..dccb08f8c579 100644
--- a/vcl/inc/vcl/svgdata.hxx
+++ b/include/vcl/svgdata.hxx
diff --git a/vcl/inc/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 66875e8979b5..66875e8979b5 100644
--- a/vcl/inc/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
diff --git a/vcl/inc/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index d06e72aee22f..d06e72aee22f 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
diff --git a/vcl/inc/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 07661431a94a..07661431a94a 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
diff --git a/vcl/inc/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 05b8313b537b..05b8313b537b 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
diff --git a/vcl/inc/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index 7555f3f01701..7555f3f01701 100644
--- a/vcl/inc/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
diff --git a/vcl/inc/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 3414ec76e834..3414ec76e834 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
diff --git a/vcl/inc/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx
index 9a9621b77e88..9a9621b77e88 100644
--- a/vcl/inc/vcl/taskpanelist.hxx
+++ b/include/vcl/taskpanelist.hxx
diff --git a/vcl/inc/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 476ba00279df..476ba00279df 100644
--- a/vcl/inc/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
diff --git a/vcl/inc/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 85b5a7b59a25..85b5a7b59a25 100644
--- a/vcl/inc/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
diff --git a/vcl/inc/vcl/textview.hxx b/include/vcl/textview.hxx
index 314e30fa4f1e..314e30fa4f1e 100644
--- a/vcl/inc/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
diff --git a/vcl/inc/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 83198187ce1c..83198187ce1c 100644
--- a/vcl/inc/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
diff --git a/vcl/inc/vcl/throbber.hxx b/include/vcl/throbber.hxx
index f2995d7555bc..f2995d7555bc 100644
--- a/vcl/inc/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
diff --git a/vcl/inc/vcl/timer.hxx b/include/vcl/timer.hxx
index 606367277a27..606367277a27 100644
--- a/vcl/inc/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
diff --git a/vcl/inc/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 3b1f69e36477..3b1f69e36477 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
diff --git a/vcl/inc/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index feb6131d12ee..feb6131d12ee 100644
--- a/vcl/inc/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
diff --git a/vcl/inc/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 91168436c3ad..91168436c3ad 100644
--- a/vcl/inc/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
diff --git a/vcl/inc/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 138ad507d656..138ad507d656 100644
--- a/vcl/inc/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
diff --git a/vcl/inc/vcl/unowrap.hxx b/include/vcl/unowrap.hxx
index 9632728eac6a..9632728eac6a 100644
--- a/vcl/inc/vcl/unowrap.hxx
+++ b/include/vcl/unowrap.hxx
diff --git a/vcl/inc/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index e0760b131c01..e0760b131c01 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
diff --git a/vcl/inc/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index bc4fa01362c2..bc4fa01362c2 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
diff --git a/vcl/inc/vcl/vclmain.hxx b/include/vcl/vclmain.hxx
index 1b60cfba42ce..1b60cfba42ce 100644
--- a/vcl/inc/vcl/vclmain.hxx
+++ b/include/vcl/vclmain.hxx
diff --git a/vcl/inc/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 63caa3b4c352..63caa3b4c352 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
diff --git a/vcl/inc/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 5d8a70e8f3dc..5d8a70e8f3dc 100644
--- a/vcl/inc/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
diff --git a/vcl/inc/vcl/waitobj.hxx b/include/vcl/waitobj.hxx
index d9164a9a61b0..d9164a9a61b0 100644
--- a/vcl/inc/vcl/waitobj.hxx
+++ b/include/vcl/waitobj.hxx
diff --git a/vcl/inc/vcl/wall.hxx b/include/vcl/wall.hxx
index e18adf78f60b..e18adf78f60b 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
diff --git a/vcl/inc/vcl/window.hxx b/include/vcl/window.hxx
index 43e232dab55c..43e232dab55c 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/include/vcl/window.hxx
diff --git a/vcl/inc/vcl/wmf.hxx b/include/vcl/wmf.hxx
index ed0b5e27fd50..ed0b5e27fd50 100644
--- a/vcl/inc/vcl/wmf.hxx
+++ b/include/vcl/wmf.hxx
diff --git a/vcl/inc/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index d151d1f12232..d151d1f12232 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
diff --git a/vcl/inc/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx
index b763e37102c7..b763e37102c7 100644
--- a/vcl/inc/vcl/xtextedt.hxx
+++ b/include/vcl/xtextedt.hxx
diff --git a/xmloff/inc/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx
index 576414bb7135..576414bb7135 100644
--- a/xmloff/inc/xmloff/DashStyle.hxx
+++ b/include/xmloff/DashStyle.hxx
diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index a9277946ca9a..a9277946ca9a 100644
--- a/xmloff/inc/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx
index f2ef26d4c974..f2ef26d4c974 100644
--- a/xmloff/inc/xmloff/EnumPropertyHdl.hxx
+++ b/include/xmloff/EnumPropertyHdl.hxx
diff --git a/xmloff/inc/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 145ba554505d..145ba554505d 100644
--- a/xmloff/inc/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
diff --git a/xmloff/inc/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 6cdceb618f10..6cdceb618f10 100644
--- a/xmloff/inc/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
diff --git a/xmloff/inc/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 5c0dfd6ff820..5c0dfd6ff820 100644
--- a/xmloff/inc/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
diff --git a/xmloff/inc/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 5cff7cb23745..5cff7cb23745 100644
--- a/xmloff/inc/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx
index e6dc49c20fff..e6dc49c20fff 100644
--- a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx
+++ b/include/xmloff/NamedBoolPropertyHdl.hxx
diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx
index c3a83922ec14..c3a83922ec14 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/include/xmloff/PageMasterStyleMap.hxx
diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index e34e6a07919d..e34e6a07919d 100644
--- a/xmloff/inc/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
diff --git a/xmloff/inc/xmloff/PropertySetInfoHash.hxx b/include/xmloff/PropertySetInfoHash.hxx
index 8d9705b68afb..8d9705b68afb 100644
--- a/xmloff/inc/xmloff/PropertySetInfoHash.hxx
+++ b/include/xmloff/PropertySetInfoHash.hxx
diff --git a/xmloff/inc/xmloff/PropertySetInfoKey.hxx b/include/xmloff/PropertySetInfoKey.hxx
index 79e49d8568aa..79e49d8568aa 100644
--- a/xmloff/inc/xmloff/PropertySetInfoKey.hxx
+++ b/include/xmloff/PropertySetInfoKey.hxx
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 7413438fe8f7..7413438fe8f7 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index 5981597c68bd..5981597c68bd 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
diff --git a/xmloff/inc/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx
index 7f47295eb71c..7f47295eb71c 100644
--- a/xmloff/inc/xmloff/SchXMLSeriesHelper.hxx
+++ b/include/xmloff/SchXMLSeriesHelper.hxx
diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index e790e09860da..e790e09860da 100644
--- a/xmloff/inc/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 576339d9c9de..576339d9c9de 100644
--- a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx
index 6430b8258c6e..6430b8258c6e 100644
--- a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx
+++ b/include/xmloff/WordWrapPropertyHdl.hxx
diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index d2804928a324..d2804928a324 100644
--- a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 644b03877d64..644b03877d64 100644
--- a/xmloff/inc/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx
index cad125159d11..cad125159d11 100644
--- a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx
+++ b/include/xmloff/XMLConstantsPropertyHandler.hxx
diff --git a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 40f42b6be202..40f42b6be202 100644
--- a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index 52b77daa8764..52b77daa8764 100644
--- a/xmloff/inc/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index 8f7da79b4fb8..8f7da79b4fb8 100644
--- a/xmloff/inc/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
diff --git a/xmloff/inc/xmloff/XMLFilterServiceNames.h b/include/xmloff/XMLFilterServiceNames.h
index 332935228e08..332935228e08 100644
--- a/xmloff/inc/xmloff/XMLFilterServiceNames.h
+++ b/include/xmloff/XMLFilterServiceNames.h
diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx
index 8ee84d8686df..8ee84d8686df 100644
--- a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index c04d5c12230a..c04d5c12230a 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index 06fee705d04d..06fee705d04d 100644
--- a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index c30dbe43d786..c30dbe43d786 100644
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index 819da2b41d77..819da2b41d77 100644
--- a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index 2f39eee0e08f..2f39eee0e08f 100644
--- a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/include/xmloff/XMLStringVector.hxx
index 863ec7aa4d3e..863ec7aa4d3e 100644
--- a/xmloff/inc/xmloff/XMLStringVector.hxx
+++ b/include/xmloff/XMLStringVector.hxx
diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx
index f3768da8ab40..f3768da8ab40 100644
--- a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx
+++ b/include/xmloff/XMLTextListAutoStylePool.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index c0965e7564f9..c0965e7564f9 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index 8ef0dcaef6a6..8ef0dcaef6a6 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx
index 9d03c401b900..9d03c401b900 100644
--- a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx
+++ b/include/xmloff/XMLTextMasterStylesContext.hxx
diff --git a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx
index 46d77a487297..46d77a487297 100644
--- a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx
+++ b/include/xmloff/XMLTextShapeImportHelper.hxx
diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index 922153a9188a..922153a9188a 100644
--- a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx
index c0a3df1aa88c..c0a3df1aa88c 100644
--- a/xmloff/inc/xmloff/XMLTextTableContext.hxx
+++ b/include/xmloff/XMLTextTableContext.hxx
diff --git a/xmloff/inc/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 1ab8e0f9dcd6..1ab8e0f9dcd6 100644
--- a/xmloff/inc/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
diff --git a/xmloff/inc/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 694433780c5f..694433780c5f 100644
--- a/xmloff/inc/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
diff --git a/xmloff/inc/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index cc0d6aa14f65..cc0d6aa14f65 100644
--- a/xmloff/inc/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
diff --git a/xmloff/inc/xmloff/contextid.hxx b/include/xmloff/contextid.hxx
index fd0123d33ac3..fd0123d33ac3 100644
--- a/xmloff/inc/xmloff/contextid.hxx
+++ b/include/xmloff/contextid.hxx
diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 3e2cbfd51e23..3e2cbfd51e23 100644
--- a/xmloff/inc/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
diff --git a/xmloff/inc/xmloff/dllapi.h b/include/xmloff/dllapi.h
index 3fcc7b6d1ef2..3fcc7b6d1ef2 100644
--- a/xmloff/inc/xmloff/dllapi.h
+++ b/include/xmloff/dllapi.h
diff --git a/xmloff/inc/xmloff/families.hxx b/include/xmloff/families.hxx
index 1a16eaa98c62..1a16eaa98c62 100644
--- a/xmloff/inc/xmloff/families.hxx
+++ b/include/xmloff/families.hxx
diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 5774988f42d8..5774988f42d8 100644
--- a/xmloff/inc/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index 9a05b73c9ec0..9a05b73c9ec0 100644
--- a/xmloff/inc/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx
index 22b8ad862a29..22b8ad862a29 100644
--- a/xmloff/inc/xmloff/i18nmap.hxx
+++ b/include/xmloff/i18nmap.hxx
diff --git a/xmloff/inc/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index 1f19ad464d60..1f19ad464d60 100644
--- a/xmloff/inc/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index fe7492cf5e75..fe7492cf5e75 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
diff --git a/xmloff/inc/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 9f0bac4f9e4b..9f0bac4f9e4b 100644
--- a/xmloff/inc/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
diff --git a/xmloff/inc/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index a116350db999..a116350db999 100644
--- a/xmloff/inc/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index afd3472d111c..afd3472d111c 100644
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 3ec8114c6507..3ec8114c6507 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
diff --git a/xmloff/inc/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index b9f5f04c45bd..b9f5f04c45bd 100644
--- a/xmloff/inc/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 8dfaa0f89d5e..8dfaa0f89d5e 100644
--- a/xmloff/inc/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 6de02130f243..6de02130f243 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 367c6d44b402..367c6d44b402 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index e93c0a244a51..e93c0a244a51 100644
--- a/xmloff/inc/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx
index fec6b37e0eaa..fec6b37e0eaa 100644
--- a/xmloff/inc/xmloff/table/XMLTableImport.hxx
+++ b/include/xmloff/table/XMLTableImport.hxx
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 2ac668de2d5a..2ac668de2d5a 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
diff --git a/xmloff/inc/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index ae58bdd9f55e..ae58bdd9f55e 100644
--- a/xmloff/inc/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 8e432e8cf7d7..8e432e8cf7d7 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 9228591152be..9228591152be 100644
--- a/xmloff/inc/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index d645cfc11281..d645cfc11281 100644
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
diff --git a/xmloff/inc/xmloff/uniref.hxx b/include/xmloff/uniref.hxx
index 808ed8212b97..808ed8212b97 100644
--- a/xmloff/inc/xmloff/uniref.hxx
+++ b/include/xmloff/uniref.hxx
diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index 616d1db4f740..616d1db4f740 100644
--- a/xmloff/inc/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
diff --git a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index e538cbe176e0..e538cbe176e0 100644
--- a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
diff --git a/xmloff/inc/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx
index 802180126f1b..802180126f1b 100644
--- a/xmloff/inc/xmloff/xformsexport.hxx
+++ b/include/xmloff/xformsexport.hxx
diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index b6770320dbd3..b6770320dbd3 100644
--- a/xmloff/inc/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index e08b027ddb0f..e08b027ddb0f 100644
--- a/xmloff/inc/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index f99c0a55ad73..f99c0a55ad73 100644
--- a/xmloff/inc/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
diff --git a/xmloff/inc/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx
index ecf90373f30a..ecf90373f30a 100644
--- a/xmloff/inc/xmloff/xmlement.hxx
+++ b/include/xmloff/xmlement.hxx
diff --git a/xmloff/inc/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 78ecbe914850..78ecbe914850 100644
--- a/xmloff/inc/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index 9738a58fc30f..9738a58fc30f 100644
--- a/xmloff/inc/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 148f73692158..148f73692158 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 7e7bb7658903..7e7bb7658903 100644
--- a/xmloff/inc/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 37903e4b4f8a..37903e4b4f8a 100644
--- a/xmloff/inc/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 750f56725aaf..750f56725aaf 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index 642e898aa3bb..642e898aa3bb 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 3b99cbfabfdf..3b99cbfabfdf 100644
--- a/xmloff/inc/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 061bd78e6df0..061bd78e6df0 100644
--- a/xmloff/inc/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx
index cb0a290b1bbd..cb0a290b1bbd 100644
--- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
+++ b/include/xmloff/xmlmultiimagehelper.hxx
diff --git a/xmloff/inc/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index b1646c307b63..b1646c307b63 100644
--- a/xmloff/inc/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 78e7cbfdd191..78e7cbfdd191 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 20029a6f99b7..20029a6f99b7 100644
--- a/xmloff/inc/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 34bb91cbe9fe..34bb91cbe9fe 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index ea547379f261..ea547379f261 100644
--- a/xmloff/inc/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index 3ed1af78e736..3ed1af78e736 100644
--- a/xmloff/inc/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index 746e9e39d3e7..746e9e39d3e7 100644
--- a/xmloff/inc/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 0da806ea6768..0da806ea6768 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
diff --git a/xmloff/inc/xmloff/xmlreg.hxx b/include/xmloff/xmlreg.hxx
index 1095e4861a88..1095e4861a88 100644
--- a/xmloff/inc/xmloff/xmlreg.hxx
+++ b/include/xmloff/xmlreg.hxx
diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx
index 031e33511a91..031e33511a91 100644
--- a/xmloff/inc/xmloff/xmlscripti.hxx
+++ b/include/xmloff/xmlscripti.hxx
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 86641f067982..86641f067982 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
diff --git a/xmloff/inc/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx
index 114624d1a15a..114624d1a15a 100644
--- a/xmloff/inc/xmloff/xmltabe.hxx
+++ b/include/xmloff/xmltabe.hxx
diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx
index 9df059f6da9a..9df059f6da9a 100644
--- a/xmloff/inc/xmloff/xmltkmap.hxx
+++ b/include/xmloff/xmltkmap.hxx
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index a40da2c19b5c..a40da2c19b5c 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index c20394fd934e..c20394fd934e 100644
--- a/xmloff/inc/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index bc4ddb6b6dbd..bc4ddb6b6dbd 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
diff --git a/xmlreader/inc/xmlreader/README b/include/xmlreader/README
index 41b43e7e8882..41b43e7e8882 100644
--- a/xmlreader/inc/xmlreader/README
+++ b/include/xmlreader/README
diff --git a/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx b/include/xmlreader/detail/xmlreaderdllapi.hxx
index 6325bdbe71bd..6325bdbe71bd 100644
--- a/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx
+++ b/include/xmlreader/detail/xmlreaderdllapi.hxx
diff --git a/xmlreader/inc/xmlreader/pad.hxx b/include/xmlreader/pad.hxx
index 0b8e1f3b7453..0b8e1f3b7453 100644
--- a/xmlreader/inc/xmlreader/pad.hxx
+++ b/include/xmlreader/pad.hxx
diff --git a/xmlreader/inc/xmlreader/span.hxx b/include/xmlreader/span.hxx
index 4f3e4d1c285d..4f3e4d1c285d 100644
--- a/xmlreader/inc/xmlreader/span.hxx
+++ b/include/xmlreader/span.hxx
diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index 90770a9432da..90770a9432da 100644
--- a/xmlreader/inc/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 5d3c747452ae..5d3c747452ae 100644
--- a/xmlscript/inc/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx
index 28f726d57109..28f726d57109 100644
--- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx
+++ b/include/xmlscript/xmldlg_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx
index 08f58c5e6049..08f58c5e6049 100644
--- a/xmlscript/inc/xmlscript/xmllib_imexp.hxx
+++ b/include/xmlscript/xmllib_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx
index 2898d8a5fc20..2898d8a5fc20 100644
--- a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx
+++ b/include/xmlscript/xmlmod_imexp.hxx
diff --git a/xmlscript/inc/xmlscript/xmlns.h b/include/xmlscript/xmlns.h
index cb0e37af0b07..cb0e37af0b07 100644
--- a/xmlscript/inc/xmlscript/xmlns.h
+++ b/include/xmlscript/xmlns.h
diff --git a/xmlscript/inc/xmlscript/xmlscriptdllapi.h b/include/xmlscript/xmlscriptdllapi.h
index b9634d57ee36..b9634d57ee36 100644
--- a/xmlscript/inc/xmlscript/xmlscriptdllapi.h
+++ b/include/xmlscript/xmlscriptdllapi.h
diff --git a/jvmaccess/Module_jvmaccess.mk b/jvmaccess/Module_jvmaccess.mk
index 61fe9be1aa9c..67e18f65e3b1 100644
--- a/jvmaccess/Module_jvmaccess.mk
+++ b/jvmaccess/Module_jvmaccess.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,jvmaccess))
 ifeq ($(SOLAR_JAVA),TRUE)
 
 $(eval $(call gb_Module_add_targets,jvmaccess,\
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_targets,jvmaccess,\
diff --git a/jvmaccess/Package_inc.mk b/jvmaccess/Package_inc.mk
deleted file mode 100644
index df362447eae6..000000000000
--- a/jvmaccess/Package_inc.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,jvmaccess_inc,$(SRCDIR)/jvmaccess/inc/jvmaccess))
-
-$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/classpath.hxx,classpath.hxx))
-$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/jvmaccessdllapi.h,jvmaccessdllapi.h))
-$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/unovirtualmachine.hxx,unovirtualmachine.hxx))
-$(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/virtualmachine.hxx,virtualmachine.hxx))
-
-# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 126cb82b15a7..51ae323646ce 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -13,7 +13,6 @@ ifeq ($(SOLAR_JAVA),TRUE)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
     Library_jvmfwk \
-    Package_inc \
     Package_rcfiles \
 ))
 
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
deleted file mode 100644
index e15716a2a945..000000000000
--- a/jvmfwk/Package_inc.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
-
-$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
-$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
-$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
-$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
-
-# vim:set noet sw=4 ts=4:
diff --git a/linguistic/Module_linguistic.mk b/linguistic/Module_linguistic.mk
index 0ef7d04c4c92..956c1bbc2e80 100644
--- a/linguistic/Module_linguistic.mk
+++ b/linguistic/Module_linguistic.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,linguistic))
 
 $(eval $(call gb_Module_add_targets,linguistic,\
 	Library_lng \
-	Package_inc \
 ))
 
 #$(eval $(call gb_Module_add_check_targets,linguistic,\
diff --git a/linguistic/Package_inc.mk b/linguistic/Package_inc.mk
deleted file mode 100644
index f691b0ac1d21..000000000000
--- a/linguistic/Package_inc.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,linguistic_inc,$(SRCDIR)/linguistic/inc))
-
-# add files to the package
-# SOURCE_RELPATH/file.ext is the name of the source file (relative to the root give above)
-# DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngdllapi.h,linguistic/lngdllapi.h))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/hyphdta.hxx,linguistic/hyphdta.hxx))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngprophelp.hxx,linguistic/lngprophelp.hxx))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/lngprops.hxx,linguistic/lngprops.hxx))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/misc.hxx,linguistic/misc.hxx))
-$(eval $(call gb_Package_add_file,linguistic_inc,inc/linguistic/spelldta.hxx,linguistic/spelldta.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/o3tl/Module_o3tl.mk b/o3tl/Module_o3tl.mk
index 7b9b3e5f4576..ba02bb76aa44 100644
--- a/o3tl/Module_o3tl.mk
+++ b/o3tl/Module_o3tl.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Module_Module,o3tl))
 
 $(eval $(call gb_Module_add_targets,o3tl,\
-	Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,o3tl,\
diff --git a/o3tl/Package_inc.mk b/o3tl/Package_inc.mk
deleted file mode 100644
index b4a6575b1088..000000000000
--- a/o3tl/Package_inc.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,o3tl_inc,$(SRCDIR)/o3tl/inc))
-
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/compat_functional.hxx,o3tl/compat_functional.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/cow_wrapper.hxx,o3tl/cow_wrapper.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/heap_ptr.hxx,o3tl/heap_ptr.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/lazy_update.hxx,o3tl/lazy_update.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/range.hxx,o3tl/range.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/vector_pool.hxx,o3tl/vector_pool.hxx))
-$(eval $(call gb_Package_add_file,o3tl_inc,inc/o3tl/sorted_vector.hxx,o3tl/sorted_vector.hxx))
-
-# vim: set noet sw=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 001c8682e5cd..3de3f1a81719 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,oox))
 $(eval $(call gb_Module_add_targets,oox,\
 	CustomTarget_generated \
     Library_oox \
-    Package_inc \
     Package_generated \
     Package_tokens \
 ))
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
deleted file mode 100644
index 798295f229a9..000000000000
--- a/oox/Package_inc.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,oox_inc,$(SRCDIR)/oox/inc))
-
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterbase.hxx,oox/core/filterbase.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/filterdetect.hxx,oox/core/filterdetect.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler2.hxx,oox/core/fragmenthandler2.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/relations.hxx,oox/core/relations.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/xmlfilterbase.hxx,oox/core/xmlfilterbase.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binarycodec.hxx,oox/core/binarycodec.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler.hxx,oox/core/contexthandler.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler2.hxx,oox/core/contexthandler2.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler.hxx,oox/core/fragmenthandler.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/color.hxx,oox/drawingml/color.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/theme.hxx,oox/drawingml/theme.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/clrscheme.hxx,oox/drawingml/clrscheme.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape.hxx,oox/drawingml/shape.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/drawingmltypes.hxx,oox/drawingml/drawingmltypes.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/customshapeproperties.hxx,oox/drawingml/customshapeproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textliststyle.hxx,oox/drawingml/textliststyle.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/colorchoicecontext.hxx,oox/drawingml/colorchoicecontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textparagraphproperties.hxx,oox/drawingml/textparagraphproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillproperties.hxx,oox/drawingml/fillproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/fillpropertiesgroupcontext.hxx,oox/drawingml/fillpropertiesgroupcontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertiescontext.hxx,oox/drawingml/shapepropertiescontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapegroupcontext.hxx,oox/drawingml/shapegroupcontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapecontext.hxx,oox/drawingml/shapecontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/embeddedwavaudiofile.hxx,oox/drawingml/embeddedwavaudiofile.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textcharacterproperties.hxx,oox/drawingml/textcharacterproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textspacing.hxx,oox/drawingml/textspacing.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shape3dproperties.hxx,oox/drawingml/shape3dproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/connectorshapecontext.hxx,oox/drawingml/connectorshapecontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/graphicshapecontext.hxx,oox/drawingml/graphicshapecontext.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/textfont.hxx,oox/drawingml/textfont.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/lineproperties.hxx,oox/drawingml/lineproperties.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/shapepropertymap.hxx,oox/drawingml/shapepropertymap.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/themefragmenthandler.hxx,oox/drawingml/themefragmenthandler.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/datasourcemodel.hxx,oox/drawingml/chart/datasourcemodel.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/modelbase.hxx,oox/drawingml/chart/modelbase.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/chartexport.hxx,oox/export/chartexport.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/export/drawingml.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryinputstream.hxx,oox/helper/binaryinputstream.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/binaryoutputstream.hxx,oox/helper/binaryoutputstream.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/helper.hxx,oox/helper/helper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refmap.hxx,oox/helper/refmap.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/refvector.hxx,oox/helper/refvector.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/storagebase.hxx,oox/helper/storagebase.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/zipstorage.hxx,oox/helper/zipstorage.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertymap.hxx,oox/helper/propertymap.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/propertyset.hxx,oox/helper/propertyset.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/progressbar.hxx,oox/helper/progressbar.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/helper/modelobjecthelper.hxx,oox/helper/modelobjecthelper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/export.hxx,oox/mathml/export.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/import.hxx,oox/mathml/import.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/mathml/importutils.hxx,oox/mathml/importutils.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olehelper.hxx,oox/ole/olehelper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/oleobjecthelper.hxx,oox/ole/oleobjecthelper.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/olestorage.hxx,oox/ole/olestorage.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/vbaproject.hxx,oox/ole/vbaproject.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axcontrol.hxx,oox/ole/axcontrol.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axbinaryreader.hxx,oox/ole/axbinaryreader.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/ole/axfontdata.hxx,oox/ole/axfontdata.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawing.hxx,oox/vml/vmldrawing.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshape.hxx,oox/vml/vmlshape.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlformatting.hxx,oox/vml/vmlformatting.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmldrawingfragment.hxx,oox/vml/vmldrawingfragment.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmltextbox.hxx,oox/vml/vmltextbox.hxx))
-$(eval $(call gb_Package_add_file,oox_inc,inc/oox/vml/vmlshapecontainer.hxx,oox/vml/vmlshapecontainer.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/package/Module_package.mk b/package/Module_package.mk
index 0ed480bd415e..1943546c0e9f 100644
--- a/package/Module_package.mk
+++ b/package/Module_package.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,package,\
 	Library_package2 \
 	Library_xstor \
 	Package_dtd \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/package/Package_inc.mk b/package/Package_inc.mk
deleted file mode 100644
index f85f4322d1bd..000000000000
--- a/package/Package_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,package_inc,$(SRCDIR)/package/inc))
-
-$(eval $(call gb_Package_add_file,package_inc,inc/package/Deflater.hxx,package/Deflater.hxx))
-$(eval $(call gb_Package_add_file,package_inc,inc/package/Inflater.hxx,package/Inflater.hxx))
-$(eval $(call gb_Package_add_file,package_inc,inc/package/packagedllapi.hxx,package/packagedllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 3d0eb9611956..d00b8858c74c 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_Module,registry))
 
 $(eval $(call gb_Module_add_targets,registry,\
 	Library_reg \
-	Package_inc \
 	$(if $(filter-out $(OS),IOS), \
 		Executable_regmerge \
 		Executable_regview \
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
deleted file mode 100644
index 6d67701bf73e..000000000000
--- a/registry/Package_inc.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,registry_inc,$(SRCDIR)/registry/inc/registry))
-
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regdllapi.h,regdllapi.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index 51aa12b34778..e39d10939b8f 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -29,7 +29,6 @@
 $(eval $(call gb_Module_Module,rsc))
 
 $(eval $(call gb_Module_add_targets,rsc,\
-	Package_inc \
 ))
 
 $(eval $(call gb_Module_add_targets_for_build,rsc,\
diff --git a/rsc/Package_inc.mk b/rsc/Package_inc.mk
deleted file mode 100644
index 230b54474e98..000000000000
--- a/rsc/Package_inc.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       Matúš Kukan <matus.kukan@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,rsc_inc,$(SRCDIR)/rsc/inc))
-
-$(eval $(call gb_Package_add_file,rsc_inc,inc/rsc/rscsfx.hxx,rsc/rscsfx.hxx))
-$(eval $(call gb_Package_add_file,rsc_inc,inc/rsc/rsc-vcl-shared-types.hxx,rsc/rsc-vcl-shared-types.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
index a867c753cba7..17c98c0d7cf4 100644
--- a/sax/Module_sax.mk
+++ b/sax/Module_sax.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,sax,\
     Library_expwrap \
     Library_fastsax \
     Library_sax \
-    Package_inc \
 	StaticLibrary_sax_shared \
 ))
 
diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk
deleted file mode 100644
index 8cf8114d371a..000000000000
--- a/sax/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,sax_inc,$(SRCDIR)/sax/inc))
-
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fastattribs.hxx,sax/fastattribs.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/fshelper.hxx,sax/fshelper.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/saxdllapi.h,sax/saxdllapi.h))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/converter.hxx,sax/tools/converter.hxx))
-$(eval $(call gb_Package_add_file,sax_inc,inc/sax/tools/documenthandleradapter.hxx,sax/tools/documenthandleradapter.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk
index bce79e495938..2090658710e0 100644
--- a/sfx2/Library_qstart_gtk.mk
+++ b/sfx2/Library_qstart_gtk.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_Library,qstart_gtk))
 $(eval $(call gb_Library_set_include,qstart_gtk,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/include/sfx2/ \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,qstart_gtk))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index cf0ed520c1b2..b530767e7948 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\
     -I$(SRCDIR)/sfx2/inc \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/include/sfx2/ \
     -I$(SRCDIR)/sfx2/source/inc \
     -I$(WORKDIR)/SdiTarget/sfx2/sdi \
     $$(INCLUDE) \
@@ -265,7 +265,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
 
 $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/sfx2/inc/sfx2 \
+    -I$(SRCDIR)/include/sfx2/ \
     -I$(SRCDIR)/sfx2/inc \
     -I$(SRCDIR)/sfx2/sdi \
 ))
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index b50bcfc67429..07facc67709b 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_Module,sfx2))
 $(eval $(call gb_Module_add_targets,sfx2,\
     AllLangResTarget_sfx2 \
     Library_sfx \
-    Package_inc \
     Package_sdi \
     UIConfig_sfx \
 ))
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
deleted file mode 100644
index 23b051a148d4..000000000000
--- a/sfx2/Package_inc.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/infobar.hxx,sfx2/infobar.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxcommands.h,sfx2/sfxcommands.h))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabpage.hrc,sfx2/tabpage.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocnames.hrc,sfx2/templatelocnames.hrc))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateabstractview.hxx,sfx2/templateabstractview.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateinfodlg.hxx,sfx2/templateinfodlg.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatelocalview.hxx,sfx2/templatelocalview.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templatecontaineritem.hxx,sfx2/templatecontaineritem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templateremoteview.hxx,sfx2/templateremoteview.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templaterepository.hxx,sfx2/templaterepository.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/thumbnailview.hxx,sfx2/thumbnailview.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/thumbnailviewitem.hxx,sfx2/thumbnailviewitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/titledockwin.hxx,sfx2/titledockwin.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/zoomitem.hxx,sfx2/zoomitem.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 756d1f0bcf9a..5f936408a60a 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -48,7 +48,6 @@ endif
 
 ifneq ($(filter TRUE,$(ENABLE_KDE) $(ENABLE_TDE)),)
 $(eval $(call gb_Module_add_targets,shell,\
-	Package_inc \
 ))
 endif
 
diff --git a/shell/Package_inc.mk b/shell/Package_inc.mk
deleted file mode 100644
index 3242c4347ddc..000000000000
--- a/shell/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,shell_inc,$(SRCDIR)/shell/inc/shell))
-
-$(eval $(call gb_Package_add_files,shell_inc,inc/shell,\
-	kde_headers.h \
-	tde_defines.h \
-	tde_headers.h \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sot/Module_sot.mk b/sot/Module_sot.mk
index 4ca4393fe92c..5c53d8de5402 100644
--- a/sot/Module_sot.mk
+++ b/sot/Module_sot.mk
@@ -29,7 +29,6 @@
 $(eval $(call gb_Module_Module,sot))
 
 $(eval $(call gb_Module_add_targets,sot,\
-    Package_inc \
     Library_sot \
 ))
 
diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk
deleted file mode 100644
index 4cee0fca5dd8..000000000000
--- a/sot/Package_inc.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,sot_inc,$(SRCDIR)/sot/inc))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/exchange.hxx,sot/exchange.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/factory.hxx,sot/factory.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/filelist.hxx,sot/filelist.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/formats.hxx,sot/formats.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/object.hxx,sot/object.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdata.hxx,sot/sotdata.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/sotdllapi.h,sot/sotdllapi.h))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/stg.hxx,sot/stg.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storage.hxx,sot/storage.hxx))
-$(eval $(call gb_Package_add_file,sot_inc,inc/sot/storinfo.hxx,sot/storinfo.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/store/Module_store.mk b/store/Module_store.mk
index 9f166ac3327f..720c3a3ef6d0 100644
--- a/store/Module_store.mk
+++ b/store/Module_store.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_Module,store))
 
 $(eval $(call gb_Module_add_targets,store,\
     Library_store \
-    Package_inc \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/store/Package_inc.mk b/store/Package_inc.mk
deleted file mode 100644
index 11c3e15c7411..000000000000
--- a/store/Package_inc.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,store_inc,$(SRCDIR)/store))
-
-$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h))
-$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index a3a9203760e2..d4fc672a64ac 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Module_add_targets,svl,\
     Library_fsstorage \
     Library_passwordcontainer \
     Library_svl \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,svl,\
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
deleted file mode 100644
index 77323dceffad..000000000000
--- a/svl/Package_inc.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc))
-
-
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylesheetuser.hxx,svl/stylesheetuser.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 52f07a4f116f..3ede10bdc0f1 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_sdk_api,svt))
 
 $(eval $(call gb_Library_set_include,svt,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/svtools/inc/svtools \
+    -I$(SRCDIR)/include/svtools/ \
     -I$(SRCDIR)/svtools/source/inc \
     -I$(SRCDIR)/svtools/inc \
 ))
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index a7eb36c66d61..796d034ff55c 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,svtools,\
     AllLangResTarget_svt \
     Library_hatchwindowfactory \
     Library_svt \
-    Package_inc \
     UIConfig_svt \
 ))
 
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
deleted file mode 100644
index 527db6f17d24..000000000000
--- a/svtools/Package_inc.mk
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/GraphicExportOptionsDialog.hxx,svtools/GraphicExportOptionsDialog.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentToGraphicRenderer.hxx,svtools/DocumentToGraphicRenderer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/bindablecontrolhelper.hxx,svtools/bindablecontrolhelper.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/borderhelper.hxx,svtools/borderhelper.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langhelp.hxx,svtools/langhelp.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/slidesorterbaropt.hxx,svtools/slidesorterbaropt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanelopt.hxx,svtools/toolpanelopt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/place.hxx,svtools/place.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/PlaceEditDialog.hxx,svtools/PlaceEditDialog.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/restartdialog.hxx,svtools/restartdialog.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sampletext.hxx,svtools/sampletext.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ServerDetailsControls.hxx,svtools/ServerDetailsControls.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistbox.hxx,svtools/treelistbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistentry.hxx,svtools/treelistentry.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelistentries.hxx,svtools/treelistentries.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtresid.hxx,svtools/svtresid.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrolinterface.hxx,svtools/table/tablecontrolinterface.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablesort.hxx,svtools/table/tablesort.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hxx,svtools/toolpanel/toolpanel.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/viewdataentry.hxx,svtools/viewdataentry.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index a8b69adb78d1..093d11f830cc 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,svx,\
     AllLangResTarget_gal \
     AllLangResTarget_textconversiondlgs \
     Package_globlmn_hrc \
-    Package_inc \
     Package_sdi \
     UIConfig_svx \
 ))
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
deleted file mode 100644
index acb4e25a052f..000000000000
--- a/svx/Package_inc.mk
+++ /dev/null
@@ -1,549 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,svx_inc,$(SRCDIR)/svx/inc))
-
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charthelper.hxx,svx/charthelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsoitm.hxx,svx/sxsoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshtitm.hxx,svx/sdshtitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polysc3d.hxx,svx/polysc3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dataaccessdescriptor.hxx,svx/dataaccessdescriptor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoashp.hxx,svx/svdoashp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaobjectex.hxx,svx/dbaobjectex.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeTypeNames.hxx,svx/EnhancedCustomShapeTypeNames.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itextprovider.hxx,svx/itextprovider.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxcommands.h,svx/svxcommands.h))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdview.hxx,svx/svdview.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxraitm.hxx,svx/sxraitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxroaitm.hxx,svx/sxroaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTableShape.hxx,svx/AccessibleTableShape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsxy.hxx,svx/xflbmsxy.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctl3d.hxx,svx/dlgctl3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaiitm.hxx,svx/sdtaiitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit.hxx,svx/xtextit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionParser.hxx,svx/EnhancedCustomShapeFunctionParser.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/orienthelper.hxx,svx/orienthelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxonitm.hxx,svx/sxonitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmpit.hxx,svx/xflbmpit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit.hxx,svx/xlineit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagItem.hxx,svx/SmartTagItem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpoly.hxx,svx/xpoly.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ParseContext.hxx,svx/ParseContext.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numinf.hxx,svx/numinf.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/objfac3d.hxx,svx/objfac3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolorupdate.hxx,svx/tbxcolorupdate.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhdl.hxx,svx/svdhdl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedxv.hxx,svx/svdedxv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagMgr.hxx,svx/SmartTagMgr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapeproperty.hxx,svx/shapeproperty.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/anchorid.hxx,svx/anchorid.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshprp.hxx,svx/unoshprp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewlayoutitem.hxx,svx/viewlayoutitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmmodel.hxx,svx/fmmodel.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/scene3d.hxx,svx/scene3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridif.hxx,svx/fmgridif.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfsitm.hxx,svx/sdtfsitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txencbox.hxx,svx/txencbox.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3ditem.hxx,svx/e3ditem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xoutbmp.hxx,svx/xoutbmp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotable.hxx,svx/svdotable.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshcit.hxx,svx/xftshcit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlogitm.hxx,svx/sxlogitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxrooitm.hxx,svx/sxrooitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontwork.hxx,svx/fontwork.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcecitm.hxx,svx/sxcecitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdginitm.hxx,svx/sdginitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpntv.hxx,svx/svdpntv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontlb.hxx,svx/fontlb.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit0.hxx,svx/xfillit0.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsflclit.hxx,svx/xsflclit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpageuser.hxx,svx/sdrpageuser.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbtmpit.hxx,svx/xbtmpit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxids.hrc,svx/svxids.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmfsitm.hxx,svx/sxmfsitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusioncolorcontrol.hxx,svx/extrusioncolorcontrol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrccfg.hxx,svx/fmsrccfg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pageitem.hxx,svx/pageitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpaintwindow.hxx,svx/sdrpaintwindow.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmkitm.hxx,svx/sxmkitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit.hxx,svx/xfillit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflftrit.hxx,svx/xflftrit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxopitm.hxx,svx/sxopitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntszctl.hxx,svx/fntszctl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsiitm.hxx,svx/sxsiitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlayitm.hxx,svx/sxlayitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomid.hxx,svx/unomid.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmsel.hxx,svx/frmsel.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dsceneupdater.hxx,svx/e3dsceneupdater.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdcrtv.hxx,svx/svdcrtv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itemwin.hxx,svx/itemwin.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfchim.hxx,svx/sdtfchim.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/wrapfield.hxx,svx/wrapfield.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctrl.hxx,svx/fntctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdxcgv.hxx,svx/svdxcgv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbtoolsclient.hxx,svx/dbtoolsclient.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rotmodit.hxx,svx/rotmodit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/layctrl.hxx,svx/layctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rectenum.hxx,svx/rectenum.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopath.hxx,svx/svdopath.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshtxt.hxx,svx/unoshtxt.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopage.hxx,svx/svdopage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftadit.hxx,svx/xftadit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstcit.hxx,svx/xlnstcit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdynitm.hxx,svx/sdynitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rulritem.hxx,svx/rulritem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fillctrl.hxx,svx/fillctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SvxShapeTypes.hxx,svx/SvxShapeTypes.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galctrl.hxx,svx/galctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdmod.hxx,svx/fmdmod.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/exthelpid.hrc,svx/exthelpid.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsearch.hxx,svx/fmsearch.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pfiledlg.hxx,svx/pfiledlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmovitm.hxx,svx/sxmovitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrcimp.hxx,svx/fmsrcimp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsalitm.hxx,svx/sxsalitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoole2.hxx,svx/svdoole2.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsnpv.hxx,svx/svdsnpv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery1.hxx,svx/gallery1.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/passwd.hxx,svx/passwd.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrscit.hxx,svx/xgrscit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglev.hxx,svx/svdglev.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkbar.hxx,svx/fontworkbar.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeGeometry.hxx,svx/EnhancedCustomShapeGeometry.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxitems.hrc,svx/svxitems.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmpage.hxx,svx/fmpage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlncapit.hxx,svx/xlncapit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhelpline.hxx,svx/sdr/overlay/overlayhelpline.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectcell.hxx,svx/sdr/overlay/overlayobjectcell.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanager.hxx,svx/sdr/overlay/overlaymanager.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx,svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectlist.hxx,svx/sdr/overlay/overlayobjectlist.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhatchrect.hxx,svx/sdr/overlay/overlayhatchrect.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytools.hxx,svx/sdr/overlay/overlaytools.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayselection.hxx,svx/sdr/overlay/overlayselection.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytriangle.hxx,svx/sdr/overlay/overlaytriangle.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaypolypolygon.hxx,svx/sdr/overlay/overlaypolypolygon.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanagerbuffered.hxx,svx/sdr/overlay/overlaymanagerbuffered.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayrollingrectangle.hxx,svx/sdr/overlay/overlayrollingrectangle.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayline.hxx,svx/sdr/overlay/overlayline.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaycrosshair.hxx,svx/sdr/overlay/overlaycrosshair.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobject.hxx,svx/sdr/overlay/overlayobject.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx,svx/sdr/overlay/overlayanimatedbitmapex.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaybitmapex.hxx,svx/sdr/overlay/overlaybitmapex.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/event/eventhandler.hxx,svx/sdr/event/eventhandler.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/itemsettools.hxx,svx/sdr/properties/itemsettools.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/connectorproperties.hxx,svx/sdr/properties/connectorproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dlatheproperties.hxx,svx/sdr/properties/e3dlatheproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/circleproperties.hxx,svx/sdr/properties/circleproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsphereproperties.hxx,svx/sdr/properties/e3dsphereproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/captionproperties.hxx,svx/sdr/properties/captionproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/customshapeproperties.hxx,svx/sdr/properties/customshapeproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/attributeproperties.hxx,svx/sdr/properties/attributeproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/rectangleproperties.hxx,svx/sdr/properties/rectangleproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/pageproperties.hxx,svx/sdr/properties/pageproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/oleproperties.hxx,svx/sdr/properties/oleproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/textproperties.hxx,svx/sdr/properties/textproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/emptyproperties.hxx,svx/sdr/properties/emptyproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dextrudeproperties.hxx,svx/sdr/properties/e3dextrudeproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/properties.hxx,svx/sdr/properties/properties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/defaultproperties.hxx,svx/sdr/properties/defaultproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dproperties.hxx,svx/sdr/properties/e3dproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/groupproperties.hxx,svx/sdr/properties/groupproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/graphicproperties.hxx,svx/sdr/properties/graphicproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dcompoundproperties.hxx,svx/sdr/properties/e3dcompoundproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsceneproperties.hxx,svx/sdr/properties/e3dsceneproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/measureproperties.hxx,svx/sdr/properties/measureproperties.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/table/tabledesign.hxx,svx/sdr/table/tabledesign.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/primitiveFactory2d.hxx,svx/sdr/primitive2d/primitiveFactory2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx,svx/sdr/primitive2d/sdrpathprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx,svx/sdr/primitive2d/sdrtextprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrprimitivetools.hxx,svx/sdr/primitive2d/sdrprimitivetools.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx,svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx,svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx,svx/sdr/primitive2d/svx_primitivetypes2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx,svx/sdr/primitive2d/sdrdecompositiontools.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx,svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx,svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx,svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx,svx/sdr/primitive2d/sdrellipseprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx,svx/sdr/primitive2d/sdrole2primitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrattributecreator.hxx,svx/sdr/primitive2d/sdrattributecreator.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx,svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx,svx/sdr/primitive2d/sdrgrafprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx,svx/sdr/primitive3d/sdrattributecreator3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx,svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx,svx/sdr/contact/viewobjectcontactofunocontrol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofpageview.hxx,svx/sdr/contact/objectcontactofpageview.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx,svx/sdr/contact/viewcontactofe3dpolygon.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx,svx/sdr/contact/viewobjectcontactofsdrpage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx,svx/sdr/contact/viewobjectcontactofsdrobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx,svx/sdr/contact/objectcontactofobjlistpainter.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx,svx/sdr/contact/viewobjectcontactofe3dscene.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontact.hxx,svx/sdr/contact/viewcontact.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx,svx/sdr/contact/viewobjectcontactofpageobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx,svx/sdr/contact/viewcontactofsdrcaptionobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx,svx/sdr/contact/viewcontactofsdrcircobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx,svx/sdr/contact/viewcontactofsdrole2obj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactoftextobj.hxx,svx/sdr/contact/viewcontactoftextobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpage.hxx,svx/sdr/contact/viewcontactofsdrpage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofunocontrol.hxx,svx/sdr/contact/viewcontactofunocontrol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx,svx/sdr/contact/viewcontactofsdredgeobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3d.hxx,svx/sdr/contact/viewobjectcontactofe3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dsphere.hxx,svx/sdr/contact/viewcontactofe3dsphere.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx,svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3d.hxx,svx/sdr/contact/viewcontactofe3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontact.hxx,svx/sdr/contact/viewobjectcontact.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx,svx/sdr/contact/viewcontactofsdrpathobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx,svx/sdr/contact/viewcontactofsdrmediaobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dlathe.hxx,svx/sdr/contact/viewcontactofe3dlathe.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx,svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgraphic.hxx,svx/sdr/contact/viewcontactofgraphic.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactredirector.hxx,svx/sdr/contact/viewobjectcontactredirector.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx,svx/sdr/contact/viewobjectcontactofgraphic.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgroup.hxx,svx/sdr/contact/viewcontactofgroup.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/displayinfo.hxx,svx/sdr/contact/displayinfo.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobj.hxx,svx/sdr/contact/viewcontactofsdrobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx,svx/sdr/contact/viewcontactofsdrmeasureobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx,svx/sdr/contact/viewcontactofsdrrectobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgroup.hxx,svx/sdr/contact/viewobjectcontactofgroup.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx,svx/sdr/attribute/sdrformtextoutlineattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextattribute.hxx,svx/sdr/attribute/sdrformtextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx,svx/sdr/attribute/sdrlineshadowtextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrfilltextattribute.hxx,svx/sdr/attribute/sdrfilltextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx,svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrshadowtextattribute.hxx,svx/sdr/attribute/sdrshadowtextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrtextattribute.hxx,svx/sdr/attribute/sdrtextattribute.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialcontrol.hxx,svx/dialcontrol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoom_def.hxx,svx/zoom_def.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charmap.hxx,svx/charmap.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/connctrl.hxx,svx/connctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtacitm.hxx,svx/sdtacitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyperdlg.hxx,svx/hyperdlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxctl.hxx,svx/tbxctl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/f3dchild.hxx,svx/f3dchild.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdogrp.hxx,svx/svdogrp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/simptabl.hxx,svx/simptabl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxelditm.hxx,svx/sxelditm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomslideritem.hxx,svx/zoomslideritem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshtit.hxx,svx/xftshtit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/float3d.hxx,svx/float3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlntrit.hxx,svx/xlntrit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmodel.hxx,svx/svdmodel.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtext.hxx,svx/svdtext.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTextHelper.hxx,svx/AccessibleTextHelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtayitm.hxx,svx/sdtayitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtmfitm.hxx,svx/sdtmfitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomsliderctrl.hxx,svx/zoomsliderctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polygn3d.hxx,svx/polygn3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglob.hxx,svx/svdglob.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpool.hxx,svx/xpool.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelink.hxx,svx/framelink.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoprov.hxx,svx/unoprov.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/checklbx.hxx,svx/checklbx.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selctrl.hxx,svx/selctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdggaitm.hxx,svx/sdggaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbtoxy.hxx,svx/xflbtoxy.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabline.hxx,svx/tabline.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpool.hxx,svx/svdpool.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/stddlg.hxx,svx/stddlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaseregistrationui.hxx,svx/databaseregistrationui.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdef.hxx,svx/xdef.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/algitem.hxx,svx/algitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxfiitm.hxx,svx/sxfiitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfflt.hxx,svx/grfflt.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaselocationinput.hxx,svx/databaselocationinput.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsuitm.hxx,svx/sxmsuitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialmgr.hxx,svx/dialmgr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdash.hxx,svx/xdash.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit0.hxx,svx/xlineit0.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/measctrl.hxx,svx/measctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdooitm.hxx,svx/sdooitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpage.hxx,svx/svdpage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsob.hxx,svx/svdsob.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshcitm.hxx,svx/sdshcitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaitm.hxx,svx/sdtaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtrans.hxx,svx/svdtrans.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgtritm.hxx,svx/sdgtritm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxdraw.hxx,svx/tbxdraw.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdprcitm.hxx,svx/sdprcitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomodel.hxx,svx/unomodel.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarderListener.hxx,svx/IAccessibleViewForwarderListener.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdlayer.hxx,svx/svdlayer.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflasit.hxx,svx/xflasit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflclit.hxx,svx/xflclit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsaitm.hxx,svx/sxsaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/verttexttbxctrl.hxx,svx/verttexttbxctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/contdlg.hxx,svx/contdlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxerr.hxx,svx/svxerr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpagv.hxx,svx/svdpagv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocapt.hxx,svx/svdocapt.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pagectrl.hxx,svx/pagectrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreoitm.hxx,svx/sxreoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtypes.hxx,svx/svdtypes.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hrc,svx/ucsubset.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pszctrl.hxx,svx/pszctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattrx.hxx,svx/svdattrx.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtditm.hxx,svx/sdtditm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframevalidation.hxx,svx/swframevalidation.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrad.hxx,svx/xgrad.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpoev.hxx,svx/svdpoev.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbckit.hxx,svx/xflbckit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit0.hxx,svx/xtextit0.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreaitm.hxx,svx/sxreaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galbrws.hxx,svx/galbrws.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomod.hxx,svx/unomod.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnclit.hxx,svx/xlnclit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/deflt3d.hxx,svx/deflt3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dundo.hxx,svx/e3dundo.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ChildrenManager.hxx,svx/ChildrenManager.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridcl.hxx,svx/fmgridcl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdobj.hxx,svx/svdobj.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtaitm.hxx,svx/sxmtaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipboardctl.hxx,svx/clipboardctl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtable.hxx,svx/xtable.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcoitm.hxx,svx/sdgcoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdovirt.hxx,svx/svdovirt.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmshell.hxx,svx/fmshell.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleParent.hxx,svx/IAccessibleParent.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmark.hxx,svx/svdmark.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/strarray.hxx,svx/strarray.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgluitm.hxx,svx/sdgluitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtakitm.hxx,svx/sdtakitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SpellDialogChildWindow.hxx,svx/SpellDialogChildWindow.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xexch.hxx,svx/xexch.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery.hxx,svx/gallery.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctrl.hxx,svx/dlgctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/DescriptionGenerator.hxx,svx/DescriptionGenerator.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xenum.hxx,svx/xenum.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numfmtsh.hxx,svx/numfmtsh.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmglob.hxx,svx/fmglob.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framebordertype.hxx,svx/framebordertype.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomeas.hxx,svx/svdomeas.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/insctrl.hxx,svx/insctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoedge.hxx,svx/svdoedge.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/bmpmask.hxx,svx/bmpmask.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshitm.hxx,svx/sdshitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddef.hxx,svx/svddef.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbcontrl.hxx,svx/tbcontrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dstribut_enum.hxx,svx/dstribut_enum.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcllitm.hxx,svx/sxcllitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rubydialog.hxx,svx/rubydialog.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ipolypolygoneditorcontroller.hxx,svx/ipolypolygoneditorcontroller.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleOLEShape.hxx,svx/AccessibleOLEShape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusionbar.hxx,svx/extrusionbar.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleControlShape.hxx,svx/AccessibleControlShape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/paraprev.hxx,svx/paraprev.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshxy.hxx,svx/xftshxy.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcustomshapes.hxx,svx/tbxcustomshapes.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrhittesthelper.hxx,svx/sdrhittesthelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdviter.hxx,svx/svdviter.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ofaitem.hxx,svx/ofaitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmdirlbox.hxx,svx/frmdirlbox.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShape2d.hxx,svx/EnhancedCustomShape2d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxoneitm.hxx,svx/sxoneitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/msdffdef.hxx,svx/msdffdef.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xattr.hxx,svx/xattr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmuitm.hxx,svx/sxmuitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdsxyitm.hxx,svx/sdsxyitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/postattr.hxx,svx/postattr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoattr.hxx,svx/svdoattr.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/prtqry.hxx,svx/prtqry.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sphere3d.hxx,svx/sphere3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomedia.hxx,svx/svdomedia.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflboxy.hxx,svx/xflboxy.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeposstrings.hxx,svx/swframeposstrings.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditer.hxx,svx/svditer.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmspitm.hxx,svx/sxmspitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmobjfac.hxx,svx/fmobjfac.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocirc.hxx,svx/svdocirc.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdlg.hxx,svx/svxdlg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxenditm.hxx,svx/sxenditm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/def3d.hxx,svx/def3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/UnoNamespaceMap.hxx,svx/UnoNamespaceMap.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxciaitm.hxx,svx/sxciaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polypolygoneditor.hxx,svx/polypolygoneditor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgmoitm.hxx,svx/sdgmoitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linectrl.hxx,svx/linectrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedcit.hxx,svx/xlnedcit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsitm.hxx,svx/sxmsitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaditm.hxx,svx/sdtaditm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotext.hxx,svx/svdotext.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/chrtitem.hxx,svx/chrtitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbitmap.hxx,svx/xbitmap.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxallitm.hxx,svx/sxallitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgutil.hxx,svx/dlgutil.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopage.hxx,svx/unopage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrag.hxx,svx/svddrag.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeTreeInfo.hxx,svx/AccessibleShapeTreeInfo.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcgitm.hxx,svx/sxcgitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedwit.hxx,svx/xlnedwit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdouno.hxx,svx/svdouno.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrmasterpagedescriptor.hxx,svx/sdrmasterpagedescriptor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcikitm.hxx,svx/sxcikitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoutl.hxx,svx/svdoutl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapepropertynotifier.hxx,svx/shapepropertynotifier.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxctitm.hxx,svx/sxctitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaexchange.hxx,svx/dbaexchange.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtritm.hxx,svx/sxmtritm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectuser.hxx,svx/sdrobjectuser.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShape.hxx,svx/AccessibleShape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hlnkitem.hxx,svx/hlnkitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xhatch.hxx,svx/xhatch.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeexample.hxx,svx/swframeexample.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstwit.hxx,svx/xlnstwit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xit.hxx,svx/xit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhlpln.hxx,svx/svdhlpln.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ctredlin.hxx,svx/ctredlin.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lathe3d.hxx,svx/lathe3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgrid.hxx,svx/optgrid.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/langbox.hxx,svx/langbox.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipfmtitem.hxx,svx/clipfmtitem.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsetit.hxx,svx/xsetit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabarea.hxx,svx/tabarea.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagCtl.hxx,svx/SmartTagCtl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolor.hxx,svx/tbxcolor.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmrkv.hxx,svx/svdmrkv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/modctrl.hxx,svx/modctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoapi.hxx,svx/unoapi.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ruler.hxx,svx/ruler.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectfilter.hxx,svx/sdrobjectfilter.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtfitm.hxx,svx/sxmtfitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdundo.hxx,svx/svdundo.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hdft.hxx,svx/hdft.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlexchg.hxx,svx/xmlexchg.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarder.hxx,svx/IAccessibleViewForwarder.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialogs.hrc,svx/dialogs.hrc))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrud3d.hxx,svx/extrud3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopool.hxx,svx/unopool.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflhtit.hxx,svx/xflhtit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedit.hxx,svx/xlnedit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmleohlp.hxx,svx/xmleohlp.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ifaceids.hxx,svx/ifaceids.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftouit.hxx,svx/xftouit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selectioncontroller.hxx,svx/selectioncontroller.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpagewindow.hxx,svx/sdrpagewindow.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcpitm.hxx,svx/sdgcpitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/view3d.hxx,svx/view3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshape.hxx,svx/unoshape.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftstit.hxx,svx/xftstit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglue.hxx,svx/svdglue.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/helperhittest3d.hxx,svx/helperhittest3d.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/flagsdef.hxx,svx/flagsdef.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaaitm.hxx,svx/sdtaaitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmview.hxx,svx/fmview.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extedit.hxx,svx/extedit.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphichelper.hxx,svx/graphichelper.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/compressgraphicdialog.hxx,svx/compressgraphicdialog.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 424c7999183d..67bd0a5f7b9e 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -52,9 +52,9 @@
 #include <svx/svdoutl.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
-#include "../svx/EnhancedCustomShapeGeometry.hxx"
-#include "../svx/EnhancedCustomShapeTypeNames.hxx"
-#include "../svx/EnhancedCustomShape2d.hxx"
+#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include "svx/EnhancedCustomShape2d.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/test/Module_test.mk b/test/Module_test.mk
index f79b0883579e..905d66b52c6f 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -14,7 +14,6 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
-    Package_inc \
     Package_unittest \
 ))
 
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
deleted file mode 100644
index a12a4b770b21..000000000000
--- a/test/Package_inc.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,test_inc,$(SRCDIR)/test/inc))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/xmldiff.hxx,test/xmldiff.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/bootstrapfixture.hxx,test/bootstrapfixture.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/testdllapi.hxx,test/testdllapi.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/unoapi_test.hxx,test/unoapi_test.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/beans/xpropertyset.hxx,test/beans/xpropertyset.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotdescriptor.hxx,test/sheet/xdatapilotdescriptor.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangesquery.hxx,test/sheet/xcellrangesquery.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xgoalseek.hxx,test/sheet/xgoalseek.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedranges.hxx,test/sheet/xnamedranges.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xnamedrange.hxx,test/sheet/xnamedrange.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatabaserange.hxx,test/sheet/xdatabaserange.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xelementaccess.hxx,test/container/xelementaccess.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamed.hxx,test/container/xnamed.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,test/container/xindexaccess.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/container/xnamereplace.hxx,test/container/xnamereplace.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangedata.hxx,test/sheet/xcellrangedata.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xcellrangereferrer.hxx,test/sheet/xcellrangereferrer.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,test/sheet/xdatapilottable.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable2.hxx,test/sheet/xdatapilottable2.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xdatapilotfieldgrouping.hxx,test/sheet/xdatapilotfieldgrouping.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,test/sheet/datapilotfield.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xprintareas.hxx,test/sheet/xprintareas.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheetdocument.hxx,test/sheet/xspreadsheetdocument.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetannotation.hxx,test/sheet/xsheetannotation.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetannotations.hxx,test/sheet/xsheetannotations.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xsheetoutline.hxx,test/sheet/xsheetoutline.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtext.hxx,test/text/xtext.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextfield.hxx,test/text/xtextfield.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextcontent.hxx,test/text/xtextcontent.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xreplaceable.hxx,test/util/xreplaceable.hxx))
-$(eval $(call gb_Package_add_file,test_inc,inc/test/util/xsearchable.hxx,test/util/xsearchable.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 7fba5fd7e5ac..731a564cdfd3 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_Module,toolkit))
 $(eval $(call gb_Module_add_targets,toolkit,\
     AllLangResTarget_tk \
     Library_tk \
-    Package_inc \
 ))
 
 ifneq ($(OOO_JUNIT_JAR),)
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
deleted file mode 100644
index b2e0b326bbea..000000000000
--- a/toolkit/Package_inc.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxsystemdependentwindow.hxx,toolkit/awt/vclxsystemdependentwindow.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindows.hxx,toolkit/awt/vclxwindows.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrol.hxx,toolkit/controls/unocontrol.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbase.hxx,toolkit/controls/unocontrolbase.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessibilityclient.hxx,toolkit/helper/accessibilityclient.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/imagealign.hxx,toolkit/helper/imagealign.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index cef5f7f5c37b..23acf677eca8 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_Module,tools))
 $(eval $(call gb_Module_add_targets,tools,\
     CustomTarget_reversemap \
     Library_tl \
-    Package_inc \
     StaticLibrary_ooopathutils \
 ))
 
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
deleted file mode 100644
index edecc9965d7b..000000000000
--- a/tools/Package_inc.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/helpers.hxx,tools/helpers.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/lineend.hxx,tools/lineend.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/Module_touch.mk b/touch/Module_touch.mk
index b2857a964301..4e844dd08b33 100644
--- a/touch/Module_touch.mk
+++ b/touch/Module_touch.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_add_targets,touch,\
 endif
 
 $(eval $(call gb_Module_add_targets,touch,\
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/touch/Package_inc.mk b/touch/Package_inc.mk
deleted file mode 100644
index f1c81a0444e0..000000000000
--- a/touch/Package_inc.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Copyright 2012 LibreOffice contributors.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_Package_Package,touch_inc,$(SRCDIR)/touch/inc))
-
-$(eval $(call gb_Package_add_file,touch_inc,inc/touch/touch.h,touch/touch.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index b909105dfbfc..8b8dc3f6328a 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -15,7 +15,6 @@ ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Module_add_targets,tubes,\
 	Executable_liboapprover \
 	Library_tubes \
-	Package_inc \
 	UIConfig_tubes \
 ))
 
diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk
deleted file mode 100644
index 9db741ed5fe8..000000000000
--- a/tubes/Package_inc.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc))
-
-$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/collaboration.hxx,tubes/collaboration.hxx))
-$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx))
-$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk
index 337e9552f041..5f667c36d325 100644
--- a/ucbhelper/Module_ucbhelper.mk
+++ b/ucbhelper/Module_ucbhelper.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,ucbhelper))
 
 $(eval $(call gb_Module_add_targets,ucbhelper,\
 	Library_ucbhelper \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk
deleted file mode 100644
index ba3830e41408..000000000000
--- a/ucbhelper/Package_inc.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,ucbhelper_inc,$(SRCDIR)/ucbhelper/inc))
-
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatasink.hxx,ucbhelper/activedatasink.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatastreamer.hxx,ucbhelper/activedatastreamer.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironment.hxx,ucbhelper/commandenvironment.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/content.hxx,ucbhelper/content.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contenthelper.hxx,ucbhelper/contenthelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentinfo.hxx,ucbhelper/contentinfo.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fd_inputstream.hxx,ucbhelper/fd_inputstream.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/getcomponentcontext.hxx,ucbhelper/getcomponentcontext.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interactionrequest.hxx,ucbhelper/interactionrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interceptedinteraction.hxx,ucbhelper/interceptedinteraction.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/propertyvalueset.hxx,ucbhelper/propertyvalueset.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultset.hxx,ucbhelper/resultset.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsetmetadata.hxx,ucbhelper/resultsetmetadata.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleauthenticationrequest.hxx,ucbhelper/simpleauthenticationrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatevalidationrequest.hxx,ucbhelper/simplecertificatevalidationrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleinteractionrequest.hxx,ucbhelper/simpleinteractionrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleioerrorrequest.hxx,ucbhelper/simpleioerrorrequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_inputstream.hxx,ucbhelper/std_inputstream.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/std_outputstream.hxx,ucbhelper/std_outputstream.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/ucbhelperdllapi.h,ucbhelper/ucbhelperdllapi.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/udm/Module_udm.mk b/udm/Module_udm.mk
index 93920e000086..ad411d4ea59a 100644
--- a/udm/Module_udm.mk
+++ b/udm/Module_udm.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,udm))
 ifneq (,$(filter ODK,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,udm,\
-    Package_inc \
     StaticLibrary_udm \
 ))
 
diff --git a/udm/Package_inc.mk b/udm/Package_inc.mk
deleted file mode 100644
index 87e6b65caf73..000000000000
--- a/udm/Package_inc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-$(eval $(call gb_Package_Package,udm_inc,$(SRCDIR)/udm/inc))
-
-$(eval $(call gb_Package_add_file,udm_inc,inc/udm/html/htmlitem.hxx,udm/html/htmlitem.hxx))
-$(eval $(call gb_Package_add_file,udm_inc,inc/udm/xml/xmlitem.hxx,udm/xml/xmlitem.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index 5bc2d1624909..92a779e3770f 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,unoidl))
 
 $(eval $(call gb_Module_add_targets,unoidl, \
     Library_unoidl \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_targets_for_build,unoidl, \
diff --git a/unoidl/Package_inc.mk b/unoidl/Package_inc.mk
deleted file mode 100644
index 84a11a311e8b..000000000000
--- a/unoidl/Package_inc.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,unoidl_inc,$(SRCDIR)/unoidl/inc/unoidl))
-
-$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/detail/dllapi.hxx,detail/dllapi.hxx))
-$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/legacyprovider.hxx,legacyprovider.hxx))
-$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/unoidl.hxx,unoidl.hxx))
-$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/unoidlprovider.hxx,unoidlprovider.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index e9eee8f0e461..4fbf71e2f412 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
-    Package_inc \
 ))
 endif
 
diff --git a/unotest/Package_inc.mk b/unotest/Package_inc.mk
deleted file mode 100644
index 28752895594c..000000000000
--- a/unotest/Package_inc.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,unotest_inc,$(SRCDIR)/unotest/inc/unotest))
-
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/bootstrapfixturebase.hxx,bootstrapfixturebase.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/filters-test.hxx,filters-test.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/macros_test.hxx,macros_test.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/gettestargument.hxx,gettestargument.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/officeconnection.hxx,officeconnection.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/toabsolutefileurl.hxx,toabsolutefileurl.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/uniquepipename.hxx,uniquepipename.hxx))
-$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/detail/unotestdllapi.hxx,detail/unotestdllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk
index 356e5ca100d2..d450dfc1fe6f 100644
--- a/unotools/Module_unotools.mk
+++ b/unotools/Module_unotools.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,unotools))
 
 $(eval $(call gb_Module_add_targets,unotools,\
     Library_utl \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
deleted file mode 100644
index 7dc7bd4bb437..000000000000
--- a/unotools/Package_inc.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc))
-
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/bootstrap.hxx,unotools/bootstrap.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/calendarwrapper.hxx,unotools/calendarwrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/caserotate.hxx,unotools/caserotate.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/charclass.hxx,unotools/charclass.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/closeveto.hxx,unotools/closeveto.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/cmdoptions.hxx,unotools/cmdoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/collatorwrapper.hxx,unotools/collatorwrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/compatibility.hxx,unotools/compatibility.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/componentresmodule.hxx,unotools/componentresmodule.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configitem.hxx,unotools/configitem.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configmgr.hxx,unotools/configmgr.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/confignode.hxx,unotools/confignode.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configpaths.hxx,unotools/configpaths.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configvaluecontainer.hxx,unotools/configvaluecontainer.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/datetime.hxx,unotools/datetime.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/defaultoptions.hxx,unotools/defaultoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/desktopterminationobserver.hxx,unotools/desktopterminationobserver.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/digitgroupingiterator.hxx,unotools/digitgroupingiterator.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/docinfohelper.hxx,unotools/docinfohelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/dynamicmenuoptions.hxx,unotools/dynamicmenuoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventcfg.hxx,unotools/eventcfg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/eventlisteneradapter.hxx,unotools/eventlisteneradapter.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/extendedsecurityoptions.hxx,unotools/extendedsecurityoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fltrcfg.hxx,unotools/fltrcfg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcfg.hxx,unotools/fontcfg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontcvt.hxx,unotools/fontcvt.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontdefs.hxx,unotools/fontdefs.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontoptions.hxx,unotools/fontoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions.hxx,unotools/historyoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/idhelper.hxx,unotools/idhelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/intlwrapper.hxx,unotools/intlwrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/itemholderbase.hxx,unotools/itemholderbase.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/lingucfg.hxx,unotools/lingucfg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/linguprops.hxx,unotools/linguprops.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localedatawrapper.hxx,unotools/localedatawrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localfilehelper.hxx,unotools/localfilehelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/localisationoptions.hxx,unotools/localisationoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/misccfg.hxx,unotools/misccfg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/moduleoptions.hxx,unotools/moduleoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/nativenumberwrapper.hxx,unotools/nativenumberwrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/numberformatcodewrapper.hxx,unotools/numberformatcodewrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/optionsdlg.hxx,unotools/optionsdlg.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/options.hxx,unotools/options.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/pathoptions.hxx,unotools/pathoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/printwarningoptions.hxx,unotools/printwarningoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/progresshandlerwrap.hxx,unotools/progresshandlerwrap.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/readwritemutexguard.hxx,unotools/readwritemutexguard.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/saveopt.hxx,unotools/saveopt.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/searchopt.hxx,unotools/searchopt.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/securityoptions.hxx,unotools/securityoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/sharedunocomponent.hxx,unotools/sharedunocomponent.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamhelper.hxx,unotools/streamhelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamsection.hxx,unotools/streamsection.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/streamwrap.hxx,unotools/streamwrap.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocale.hxx,unotools/syslocale.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/syslocaleoptions.hxx,unotools/syslocaleoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/tempfile.hxx,unotools/tempfile.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/textsearch.hxx,unotools/textsearch.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/transliterationwrapper.hxx,unotools/transliterationwrapper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbhelper.hxx,unotools/ucbhelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucblockbytes.hxx,unotools/ucblockbytes.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbstreamhelper.hxx,unotools/ucbstreamhelper.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index 339375637db6..ee82314911bb 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Module_add_targets,vbahelper,\
 endif
 
 $(eval $(call gb_Module_add_targets,vbahelper,\
-    Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk
deleted file mode 100644
index 10c3ce11594e..000000000000
--- a/vbahelper/Package_inc.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,vbahelper_inc,$(SRCDIR)/vbahelper/inc))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/helperdecl.hxx,vbahelper/helperdecl.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaaccesshelper.hxx,vbahelper/vbaaccesshelper.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaapplicationbase.hxx,vbahelper/vbaapplicationbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbacollectionimpl.hxx,vbahelper/vbacollectionimpl.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogbase.hxx,vbahelper/vbadialogbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadialogsbase.hxx,vbahelper/vbadialogsbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadllapi.h,vbahelper/vbadllapi.h))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentbase.hxx,vbahelper/vbadocumentbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbadocumentsbase.hxx,vbahelper/vbadocumentsbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaeventshelperbase.hxx,vbahelper/vbaeventshelperbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbafontbase.hxx,vbahelper/vbafontbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbaglobalbase.hxx,vbahelper/vbaglobalbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelper.hxx,vbahelper/vbahelper.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbahelperinterface.hxx,vbahelper/vbahelperinterface.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapagesetupbase.hxx,vbahelper/vbapagesetupbase.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbapropvalue.hxx,vbahelper/vbapropvalue.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashape.hxx,vbahelper/vbashape.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashaperange.hxx,vbahelper/vbashaperange.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbashapes.hxx,vbahelper/vbashapes.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbatextframe.hxx,vbahelper/vbatextframe.hxx))
-$(eval $(call gb_Package_add_file,vbahelper_inc,inc/vbahelper/vbawindowbase.hxx,vbahelper/vbawindowbase.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 12189048b2d5..976b76985d2e 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
     AllLangResTarget_vcl \
     CustomTarget_afm_hash \
     Library_vcl \
-    Package_inc \
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 		StaticLibrary_vclmain \
 		Executable_ui-previewer) \
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
deleted file mode 100644
index 0fc6bb8c1f83..000000000000
--- a/vcl/Package_inc.mk
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,vcl_inc,$(SRCDIR)/vcl/inc))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/FilterConfigItem.hxx,vcl/FilterConfigItem.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/abstdlg.hxx,vcl/abstdlg.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/animate.hxx,vcl/animate.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/apptypes.hxx,vcl/apptypes.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/builder.hxx,vcl/builder.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/canvastools.hxx,vcl/canvastools.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.hxx,vcl/cmdevt.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.h,vcl/combobox.h))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.hxx,vcl/combobox.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/configsettings.hxx,vcl/configsettings.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/controllayout.hxx,vcl/controllayout.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ctrl.hxx,vcl/ctrl.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cursor.hxx,vcl/cursor.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtgrf.hxx,vcl/cvtgrf.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtsvm.hxx,vcl/cvtsvm.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/decoview.hxx,vcl/decoview.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dialog.hxx,vcl/dialog.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dllapi.h,vcl/dllapi.h))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dndhelp.hxx,vcl/dndhelp.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockingarea.hxx,vcl/dockingarea.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockwin.hxx,vcl/dockwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/edit.hxx,vcl/edit.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/event.hxx,vcl/event.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/evntpost.hxx,vcl/evntpost.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/extoutdevdata.hxx,vcl/extoutdevdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixedhyper.hxx,vcl/fixedhyper.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fltcall.hxx,vcl/fltcall.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontcapabilities.hxx,vcl/fontcapabilities.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fpicker.hrc,vcl/fpicker.hrc))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.h,vcl/graph.h))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.hxx,vcl/graph.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphicfilter.hxx,vcl/graphicfilter.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/GraphicNativeTransform.hxx,vcl/GraphicNativeTransform.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/GraphicNativeMetadata.hxx,vcl/GraphicNativeMetadata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphictools.hxx,vcl/graphictools.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/group.hxx,vcl/group.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/hatch.hxx,vcl/hatch.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/helper.hxx,vcl/helper.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/help.hxx,vcl/help.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/i18nhelp.hxx,vcl/i18nhelp.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/image.hxx,vcl/image.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ImageListProvider.hxx,vcl/ImageListProvider.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imagerepository.hxx,vcl/imagerepository.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imgctrl.hxx,vcl/imgctrl.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/impdel.hxx,vcl/impdel.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/inputctx.hxx,vcl/inputctx.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/introwin.hxx,vcl/introwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycod.hxx,vcl/keycod.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/layout.hxx,vcl/layout.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lazydelete.hxx,vcl/lazydelete.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lineinfo.hxx,vcl/lineinfo.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/longcurr.hxx,vcl/longcurr.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.h,vcl/lstbox.h))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.hxx,vcl/lstbox.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mapmod.hxx,vcl/mapmod.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menubtn.hxx,vcl/menubtn.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menu.hxx,vcl/menu.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metaact.hxx,vcl/metaact.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metric.hxx,vcl/metric.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonicengine.hxx,vcl/mnemonicengine.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonic.hxx,vcl/mnemonic.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/morebtn.hxx,vcl/morebtn.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/msgbox.hxx,vcl/msgbox.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/octree.hxx,vcl/octree.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/oldprintadaptor.hxx,vcl/oldprintadaptor.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/outdev.hxx,vcl/outdev.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfextoutdevdata.hxx,vcl/pdfextoutdevdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfwriter.hxx,vcl/pdfwriter.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngread.hxx,vcl/pngread.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngwrite.hxx,vcl/pngwrite.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pointr.hxx,vcl/pointr.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/popupmenuwindow.hxx,vcl/popupmenuwindow.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ppdparser.hxx,vcl/ppdparser.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prgsbar.hxx,vcl/prgsbar.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/printerinfomanager.hxx,vcl/printerinfomanager.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/print.hxx,vcl/print.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prntypes.hxx,vcl/prntypes.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ptrstyle.hxx,vcl/ptrstyle.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/quickselectionengine.hxx,vcl/quickselectionengine.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/regband.hxx,vcl/regband.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/region.hxx,vcl/region.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salnativewidgets.hxx,vcl/salnativewidgets.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scopedbitmapaccess.hxx,vcl/scopedbitmapaccess.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/solarmutex.hxx,vcl/solarmutex.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/split.hxx,vcl/split.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/splitwin.hxx,vcl/splitwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/status.hxx,vcl/status.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgdata.hxx,vcl/svgdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabctrl.hxx,vcl/tabctrl.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabdlg.hxx,vcl/tabdlg.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabpage.hxx,vcl/tabpage.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/taskpanelist.hxx,vcl/taskpanelist.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/embeddedfontshelper.hxx,vcl/embeddedfontshelper.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/textdata.hxx,vcl/textdata.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/texteng.hxx,vcl/texteng.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/textview.hxx,vcl/textview.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/threadex.hxx,vcl/threadex.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/throbber.hxx,vcl/throbber.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/timer.hxx,vcl/timer.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/toolbox.hxx,vcl/toolbox.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/txtattr.hxx,vcl/txtattr.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp2.hxx,vcl/unohelp2.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp.hxx,vcl/unohelp.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unowrap.hxx,vcl/unowrap.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclenum.hxx,vcl/vclenum.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclevent.hxx,vcl/vclevent.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclmain.hxx,vcl/vclmain.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclmedit.hxx,vcl/vclmedit.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wmf.hxx,vcl/wmf.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
-$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/xtextedt.hxx,vcl/xtextedt.hxx))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index 886dac6d878a..6d0b59a8f7ff 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,xmloff,\
     Library_xo \
     Library_xof \
     Package_dtd \
-    Package_inc \
 ))
 
 $(eval $(call gb_Module_add_check_targets,xmloff,\
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
deleted file mode 100644
index 50ffee36c359..000000000000
--- a/xmloff/Package_inc.mk
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_Package_Package,xmloff_inc,$(SRCDIR)/xmloff/inc))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DashStyle.hxx,xmloff/DashStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/DocumentSettingsContext.hxx,xmloff/DocumentSettingsContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/EnumPropertyHdl.hxx,xmloff/EnumPropertyHdl.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/GradientStyle.hxx,xmloff/GradientStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/HatchStyle.hxx,xmloff/HatchStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ImageStyle.hxx,xmloff/ImageStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/MarkerStyle.hxx,xmloff/MarkerStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/NamedBoolPropertyHdl.hxx,xmloff/NamedBoolPropertyHdl.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PageMasterStyleMap.hxx,xmloff/PageMasterStyleMap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/ProgressBarHelper.hxx,xmloff/ProgressBarHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoHash.hxx,xmloff/PropertySetInfoHash.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/PropertySetInfoKey.hxx,xmloff/PropertySetInfoKey.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,xmloff/SchXMLExportHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLSeriesHelper.hxx,xmloff/SchXMLSeriesHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLConstantsPropertyHandler.hxx,xmloff/XMLConstantsPropertyHandler.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEmbeddedObjectExportFilter.hxx,xmloff/XMLEmbeddedObjectExportFilter.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventExport.hxx,xmloff/XMLEventExport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLEventsImportContext.hxx,xmloff/XMLEventsImportContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFilterServiceNames.h,xmloff/XMLFilterServiceNames.h))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontAutoStylePool.hxx,xmloff/XMLFontAutoStylePool.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLFontStylesContext.hxx,xmloff/XMLFontStylesContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLGraphicsDefaultStyle.hxx,xmloff/XMLGraphicsDefaultStyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLPageExport.hxx,xmloff/XMLPageExport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLSettingsExportContext.hxx,xmloff/XMLSettingsExportContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLShapeStyleContext.hxx,xmloff/XMLShapeStyleContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLStringVector.hxx,xmloff/XMLStringVector.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextListAutoStylePool.hxx,xmloff/XMLTextListAutoStylePool.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageContext.hxx,xmloff/XMLTextMasterPageContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterPageExport.hxx,xmloff/XMLTextMasterPageExport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextMasterStylesContext.hxx,xmloff/XMLTextMasterStylesContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeImportHelper.hxx,xmloff/XMLTextShapeImportHelper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextShapeStyleContext.hxx,xmloff/XMLTextShapeStyleContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLTextTableContext.hxx,xmloff/XMLTextTableContext.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animationexport.hxx,xmloff/animationexport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/animexp.hxx,xmloff/animexp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/attrlist.hxx,xmloff/attrlist.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/contextid.hxx,xmloff/contextid.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/controlpropertyhdl.hxx,xmloff/controlpropertyhdl.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/dllapi.h,xmloff/dllapi.h))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/families.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/numehelp.hxx,xmloff/numehelp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/odffields.hxx,xmloff/odffields.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prhdlfac.hxx,xmloff/prhdlfac.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/prstylei.hxx,xmloff/prstylei.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/settingsstore.hxx,xmloff/settingsstore.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeexport.hxx,xmloff/shapeexport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/shapeimport.hxx,xmloff/shapeimport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/styleexp.hxx,xmloff/styleexp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableExport.hxx,xmloff/table/XMLTableExport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/table/XMLTableImport.hxx,xmloff/table/XMLTableImport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimp.hxx,xmloff/txtimp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtimppr.hxx,xmloff/txtimppr.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtparae.hxx,xmloff/txtparae.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtprmap.hxx,xmloff/txtprmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/txtstyli.hxx,xmloff/txtstyli.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/uniref.hxx,xmloff/uniref.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unoatrcn.hxx,xmloff/unoatrcn.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/unointerfacetouniqueidentifiermapper.hxx,xmloff/unointerfacetouniqueidentifiermapper.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/xformsexport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexp.hxx,xmloff/xmlexp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlexppr.hxx,xmloff/xmlexppr.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlictxt.hxx,xmloff/xmlictxt.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimp.hxx,xmloff/xmlimp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlimppr.hxx,xmloff/xmlimppr.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetae.hxx,xmloff/xmlmetae.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmetai.hxx,xmloff/xmlmetai.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnmspe.hxx,xmloff/xmlnmspe.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnume.hxx,xmloff/xmlnume.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfe.hxx,xmloff/xmlnumfe.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumfi.hxx,xmloff/xmlnumfi.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlnumi.hxx,xmloff/xmlnumi.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprcon.hxx,xmloff/xmlprcon.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprhdl.hxx,xmloff/xmlprhdl.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlprmap.hxx,xmloff/xmlprmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlreg.hxx,xmloff/xmlreg.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlscripti.hxx,xmloff/xmlscripti.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlstyle.hxx,xmloff/xmlstyle.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltabe.hxx,xmloff/xmltabe.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltkmap.hxx,xmloff/xmltkmap.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltoken.hxx,xmloff/xmltoken.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmltypes.hxx,xmloff/xmltypes.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmluconv.hxx,xmloff/xmluconv.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlmultiimagehelper.hxx,xmloff/xmlmultiimagehelper.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk
index 6f6702f48e61..97d413ad3774 100644
--- a/xmlreader/Module_xmlreader.mk
+++ b/xmlreader/Module_xmlreader.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,xmlreader))
 
 $(eval $(call gb_Module_add_targets,xmlreader,\
 	Library_xmlreader \
-	Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlreader/Package_inc.mk b/xmlreader/Package_inc.mk
deleted file mode 100644
index ab2b5576e351..000000000000
--- a/xmlreader/Package_inc.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,xmlreader_inc,$(SRCDIR)/xmlreader/inc))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/pad.hxx,xmlreader/pad.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/span.hxx,xmlreader/span.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/xmlreader.hxx,xmlreader/xmlreader.hxx))
-$(eval $(call gb_Package_add_file,xmlreader_inc,inc/xmlreader/detail/xmlreaderdllapi.hxx,xmlreader/detail/xmlreaderdllapi.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
index f0bf26d43f8c..56df07de29d2 100644
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,xmlscript))
 $(eval $(call gb_Module_add_targets,xmlscript,\
     Library_xmlscript \
     Package_dtd \
-    Package_inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
deleted file mode 100644
index ca3dae99fc2b..000000000000
--- a/xmlscript/Package_inc.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
-
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlscriptdllapi.h,inc/xmlscript/xmlscriptdllapi.h))
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx))
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx))
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,inc/xmlscript/xmllib_imexp.hxx))
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,inc/xmlscript/xmlmod_imexp.hxx))
-$(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,inc/xmlscript/xmlns.h))
-
-# vim: set noet sw=4 ts=4: