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 -# -# 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 -# 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 -# -# 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 (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 (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 -# 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 similarity index 100% rename from animations/inc/animations/animationnodehelper.hxx rename to include/animations/animationnodehelper.hxx diff --git a/apple_remote/inc/apple_remote/RemoteControl.h b/include/apple_remote/RemoteControl.h similarity index 100% rename from apple_remote/inc/apple_remote/RemoteControl.h rename to include/apple_remote/RemoteControl.h diff --git a/apple_remote/inc/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h similarity index 100% rename from apple_remote/inc/apple_remote/RemoteMainController.h rename to include/apple_remote/RemoteMainController.h diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h similarity index 100% rename from avmedia/inc/avmedia/avmediadllapi.h rename to include/avmedia/avmediadllapi.h diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx similarity index 100% rename from avmedia/inc/avmedia/mediaitem.hxx rename to include/avmedia/mediaitem.hxx diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx similarity index 100% rename from avmedia/inc/avmedia/mediaplayer.hxx rename to include/avmedia/mediaplayer.hxx diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx similarity index 100% rename from avmedia/inc/avmedia/mediatoolbox.hxx rename to include/avmedia/mediatoolbox.hxx diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx similarity index 100% rename from avmedia/inc/avmedia/mediawindow.hxx rename to include/avmedia/mediawindow.hxx diff --git a/basebmp/inc/basebmp/accessor.hxx b/include/basebmp/accessor.hxx similarity index 100% rename from basebmp/inc/basebmp/accessor.hxx rename to include/basebmp/accessor.hxx diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/include/basebmp/accessoradapters.hxx similarity index 100% rename from basebmp/inc/basebmp/accessoradapters.hxx rename to include/basebmp/accessoradapters.hxx diff --git a/basebmp/inc/basebmp/accessorfunctors.hxx b/include/basebmp/accessorfunctors.hxx similarity index 100% rename from basebmp/inc/basebmp/accessorfunctors.hxx rename to include/basebmp/accessorfunctors.hxx diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/include/basebmp/accessortraits.hxx similarity index 100% rename from basebmp/inc/basebmp/accessortraits.hxx rename to include/basebmp/accessortraits.hxx diff --git a/basebmp/inc/basebmp/basebmpdllapi.h b/include/basebmp/basebmpdllapi.h similarity index 100% rename from basebmp/inc/basebmp/basebmpdllapi.h rename to include/basebmp/basebmpdllapi.h diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx similarity index 100% rename from basebmp/inc/basebmp/bitmapdevice.hxx rename to include/basebmp/bitmapdevice.hxx diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/include/basebmp/clippedlinerenderer.hxx similarity index 100% rename from basebmp/inc/basebmp/clippedlinerenderer.hxx rename to include/basebmp/clippedlinerenderer.hxx diff --git a/basebmp/inc/basebmp/color.hxx b/include/basebmp/color.hxx similarity index 100% rename from basebmp/inc/basebmp/color.hxx rename to include/basebmp/color.hxx diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/include/basebmp/colorblendaccessoradapter.hxx similarity index 100% rename from basebmp/inc/basebmp/colorblendaccessoradapter.hxx rename to include/basebmp/colorblendaccessoradapter.hxx diff --git a/basebmp/inc/basebmp/colormisc.hxx b/include/basebmp/colormisc.hxx similarity index 100% rename from basebmp/inc/basebmp/colormisc.hxx rename to include/basebmp/colormisc.hxx diff --git a/basebmp/inc/basebmp/colortraits.hxx b/include/basebmp/colortraits.hxx similarity index 100% rename from basebmp/inc/basebmp/colortraits.hxx rename to include/basebmp/colortraits.hxx diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/include/basebmp/compositeiterator.hxx similarity index 100% rename from basebmp/inc/basebmp/compositeiterator.hxx rename to include/basebmp/compositeiterator.hxx diff --git a/basebmp/inc/basebmp/debug.hxx b/include/basebmp/debug.hxx similarity index 100% rename from basebmp/inc/basebmp/debug.hxx rename to include/basebmp/debug.hxx diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/include/basebmp/drawmodes.hxx similarity index 100% rename from basebmp/inc/basebmp/drawmodes.hxx rename to include/basebmp/drawmodes.hxx diff --git a/basebmp/inc/basebmp/endian.hxx b/include/basebmp/endian.hxx similarity index 100% rename from basebmp/inc/basebmp/endian.hxx rename to include/basebmp/endian.hxx diff --git a/basebmp/inc/basebmp/fillimage.hxx b/include/basebmp/fillimage.hxx similarity index 100% rename from basebmp/inc/basebmp/fillimage.hxx rename to include/basebmp/fillimage.hxx diff --git a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/include/basebmp/genericcolorimageaccessor.hxx similarity index 100% rename from basebmp/inc/basebmp/genericcolorimageaccessor.hxx rename to include/basebmp/genericcolorimageaccessor.hxx diff --git a/basebmp/inc/basebmp/greylevelformats.hxx b/include/basebmp/greylevelformats.hxx similarity index 100% rename from basebmp/inc/basebmp/greylevelformats.hxx rename to include/basebmp/greylevelformats.hxx diff --git a/basebmp/inc/basebmp/iteratortraits.hxx b/include/basebmp/iteratortraits.hxx similarity index 100% rename from basebmp/inc/basebmp/iteratortraits.hxx rename to include/basebmp/iteratortraits.hxx diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/include/basebmp/metafunctions.hxx similarity index 100% rename from basebmp/inc/basebmp/metafunctions.hxx rename to include/basebmp/metafunctions.hxx diff --git a/basebmp/inc/basebmp/nonstandarditerator.hxx b/include/basebmp/nonstandarditerator.hxx similarity index 100% rename from basebmp/inc/basebmp/nonstandarditerator.hxx rename to include/basebmp/nonstandarditerator.hxx diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx similarity index 100% rename from basebmp/inc/basebmp/packedpixeliterator.hxx rename to include/basebmp/packedpixeliterator.hxx diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/include/basebmp/paletteformats.hxx similarity index 100% rename from basebmp/inc/basebmp/paletteformats.hxx rename to include/basebmp/paletteformats.hxx diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/include/basebmp/paletteimageaccessor.hxx similarity index 100% rename from basebmp/inc/basebmp/paletteimageaccessor.hxx rename to include/basebmp/paletteimageaccessor.hxx diff --git a/basebmp/inc/basebmp/pixelformatadapters.hxx b/include/basebmp/pixelformatadapters.hxx similarity index 100% rename from basebmp/inc/basebmp/pixelformatadapters.hxx rename to include/basebmp/pixelformatadapters.hxx diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/include/basebmp/pixeliterator.hxx similarity index 100% rename from basebmp/inc/basebmp/pixeliterator.hxx rename to include/basebmp/pixeliterator.hxx diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx similarity index 100% rename from basebmp/inc/basebmp/polypolygonrenderer.hxx rename to include/basebmp/polypolygonrenderer.hxx diff --git a/basebmp/inc/basebmp/rgb24pixelformats.hxx b/include/basebmp/rgb24pixelformats.hxx similarity index 100% rename from basebmp/inc/basebmp/rgb24pixelformats.hxx rename to include/basebmp/rgb24pixelformats.hxx diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/include/basebmp/rgbmaskpixelformats.hxx similarity index 100% rename from basebmp/inc/basebmp/rgbmaskpixelformats.hxx rename to include/basebmp/rgbmaskpixelformats.hxx diff --git a/basebmp/inc/basebmp/scaleimage.hxx b/include/basebmp/scaleimage.hxx similarity index 100% rename from basebmp/inc/basebmp/scaleimage.hxx rename to include/basebmp/scaleimage.hxx diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx similarity index 100% rename from basebmp/inc/basebmp/scanlineformats.hxx rename to include/basebmp/scanlineformats.hxx diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/include/basebmp/stridedarrayiterator.hxx similarity index 100% rename from basebmp/inc/basebmp/stridedarrayiterator.hxx rename to include/basebmp/stridedarrayiterator.hxx diff --git a/basebmp/inc/basebmp/tools.hxx b/include/basebmp/tools.hxx similarity index 100% rename from basebmp/inc/basebmp/tools.hxx rename to include/basebmp/tools.hxx diff --git a/basegfx/inc/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h similarity index 100% rename from basegfx/inc/basegfx/basegfxdllapi.h rename to include/basegfx/basegfxdllapi.h diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx similarity index 100% rename from basegfx/inc/basegfx/color/bcolor.hxx rename to include/basegfx/color/bcolor.hxx diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx similarity index 100% rename from basegfx/inc/basegfx/color/bcolormodifier.hxx rename to include/basegfx/color/bcolormodifier.hxx diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx similarity index 100% rename from basegfx/inc/basegfx/color/bcolortools.hxx rename to include/basegfx/color/bcolortools.hxx diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx similarity index 100% rename from basegfx/inc/basegfx/curve/b2dbeziertools.hxx rename to include/basegfx/curve/b2dbeziertools.hxx diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx similarity index 100% rename from basegfx/inc/basegfx/curve/b2dcubicbezier.hxx rename to include/basegfx/curve/b2dcubicbezier.hxx diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx similarity index 100% rename from basegfx/inc/basegfx/matrix/b2dhommatrix.hxx rename to include/basegfx/matrix/b2dhommatrix.hxx diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx similarity index 100% rename from basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx rename to include/basegfx/matrix/b2dhommatrixtools.hxx diff --git a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx similarity index 100% rename from basegfx/inc/basegfx/matrix/b3dhommatrix.hxx rename to include/basegfx/matrix/b3dhommatrix.hxx diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx similarity index 100% rename from basegfx/inc/basegfx/numeric/ftools.hxx rename to include/basegfx/numeric/ftools.hxx diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx similarity index 100% rename from basegfx/inc/basegfx/pixel/bpixel.hxx rename to include/basegfx/pixel/bpixel.hxx diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/include/basegfx/point/b2dpoint.hxx similarity index 100% rename from basegfx/inc/basegfx/point/b2dpoint.hxx rename to include/basegfx/point/b2dpoint.hxx diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx similarity index 100% rename from basegfx/inc/basegfx/point/b2ipoint.hxx rename to include/basegfx/point/b2ipoint.hxx diff --git a/basegfx/inc/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx similarity index 100% rename from basegfx/inc/basegfx/point/b3dpoint.hxx rename to include/basegfx/point/b3dpoint.hxx diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx b/include/basegfx/point/b3ipoint.hxx similarity index 100% rename from basegfx/inc/basegfx/point/b3ipoint.hxx rename to include/basegfx/point/b3ipoint.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx rename to include/basegfx/polygon/b2dlinegeometry.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolygon.hxx rename to include/basegfx/polygon/b2dpolygon.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx rename to include/basegfx/polygon/b2dpolygonclipper.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx rename to include/basegfx/polygon/b2dpolygoncutandtouch.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolygontools.hxx rename to include/basegfx/polygon/b2dpolygontools.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx rename to include/basegfx/polygon/b2dpolygontriangulator.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx rename to include/basegfx/polygon/b2dpolypolygon.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx rename to include/basegfx/polygon/b2dpolypolygoncutter.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx rename to include/basegfx/polygon/b2dpolypolygonfillrule.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx rename to include/basegfx/polygon/b2dpolypolygontools.hxx diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx rename to include/basegfx/polygon/b2dtrapezoid.hxx diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b3dpolygon.hxx rename to include/basegfx/polygon/b3dpolygon.hxx diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b3dpolygontools.hxx rename to include/basegfx/polygon/b3dpolygontools.hxx diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/include/basegfx/polygon/b3dpolypolygon.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx rename to include/basegfx/polygon/b3dpolypolygon.hxx diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx similarity index 100% rename from basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx rename to include/basegfx/polygon/b3dpolypolygontools.hxx diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/include/basegfx/range/b1drange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b1drange.hxx rename to include/basegfx/range/b1drange.hxx diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/include/basegfx/range/b1ibox.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b1ibox.hxx rename to include/basegfx/range/b1ibox.hxx diff --git a/basegfx/inc/basegfx/range/b1irange.hxx b/include/basegfx/range/b1irange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b1irange.hxx rename to include/basegfx/range/b1irange.hxx diff --git a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2dconnectedranges.hxx rename to include/basegfx/range/b2dconnectedranges.hxx diff --git a/basegfx/inc/basegfx/range/b2dpolyrange.hxx b/include/basegfx/range/b2dpolyrange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2dpolyrange.hxx rename to include/basegfx/range/b2dpolyrange.hxx diff --git a/basegfx/inc/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2drange.hxx rename to include/basegfx/range/b2drange.hxx diff --git a/basegfx/inc/basegfx/range/b2drangeclipper.hxx b/include/basegfx/range/b2drangeclipper.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2drangeclipper.hxx rename to include/basegfx/range/b2drangeclipper.hxx diff --git a/basegfx/inc/basegfx/range/b2drectangle.hxx b/include/basegfx/range/b2drectangle.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2drectangle.hxx rename to include/basegfx/range/b2drectangle.hxx diff --git a/basegfx/inc/basegfx/range/b2ibox.hxx b/include/basegfx/range/b2ibox.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2ibox.hxx rename to include/basegfx/range/b2ibox.hxx diff --git a/basegfx/inc/basegfx/range/b2irange.hxx b/include/basegfx/range/b2irange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2irange.hxx rename to include/basegfx/range/b2irange.hxx diff --git a/basegfx/inc/basegfx/range/b2irectangle.hxx b/include/basegfx/range/b2irectangle.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b2irectangle.hxx rename to include/basegfx/range/b2irectangle.hxx diff --git a/basegfx/inc/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b3drange.hxx rename to include/basegfx/range/b3drange.hxx diff --git a/basegfx/inc/basegfx/range/b3irange.hxx b/include/basegfx/range/b3irange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/b3irange.hxx rename to include/basegfx/range/b3irange.hxx diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx similarity index 100% rename from basegfx/inc/basegfx/range/basicbox.hxx rename to include/basegfx/range/basicbox.hxx diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/include/basegfx/range/basicrange.hxx similarity index 100% rename from basegfx/inc/basegfx/range/basicrange.hxx rename to include/basegfx/range/basicrange.hxx diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx similarity index 100% rename from basegfx/inc/basegfx/raster/bpixelraster.hxx rename to include/basegfx/raster/bpixelraster.hxx diff --git a/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx similarity index 100% rename from basegfx/inc/basegfx/raster/bzpixelraster.hxx rename to include/basegfx/raster/bzpixelraster.hxx diff --git a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx similarity index 100% rename from basegfx/inc/basegfx/raster/rasterconvert3d.hxx rename to include/basegfx/raster/rasterconvert3d.hxx diff --git a/basegfx/inc/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/b2dclipstate.hxx rename to include/basegfx/tools/b2dclipstate.hxx diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/include/basegfx/tools/canvastools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/canvastools.hxx rename to include/basegfx/tools/canvastools.hxx diff --git a/basegfx/inc/basegfx/tools/gradienttools.hxx b/include/basegfx/tools/gradienttools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/gradienttools.hxx rename to include/basegfx/tools/gradienttools.hxx diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/include/basegfx/tools/keystoplerp.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/keystoplerp.hxx rename to include/basegfx/tools/keystoplerp.hxx diff --git a/basegfx/inc/basegfx/tools/lerp.hxx b/include/basegfx/tools/lerp.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/lerp.hxx rename to include/basegfx/tools/lerp.hxx diff --git a/basegfx/inc/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/rectcliptools.hxx rename to include/basegfx/tools/rectcliptools.hxx diff --git a/basegfx/inc/basegfx/tools/tools.hxx b/include/basegfx/tools/tools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/tools.hxx rename to include/basegfx/tools/tools.hxx diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/unopolypolygon.hxx rename to include/basegfx/tools/unopolypolygon.hxx diff --git a/basegfx/inc/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/unotools.hxx rename to include/basegfx/tools/unotools.hxx diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx similarity index 100% rename from basegfx/inc/basegfx/tools/zoomtools.hxx rename to include/basegfx/tools/zoomtools.hxx diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b2dtuple.hxx rename to include/basegfx/tuple/b2dtuple.hxx diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b2i64tuple.hxx rename to include/basegfx/tuple/b2i64tuple.hxx diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b2ituple.hxx rename to include/basegfx/tuple/b2ituple.hxx diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b3dtuple.hxx rename to include/basegfx/tuple/b3dtuple.hxx diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/include/basegfx/tuple/b3i64tuple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b3i64tuple.hxx rename to include/basegfx/tuple/b3i64tuple.hxx diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx similarity index 100% rename from basegfx/inc/basegfx/tuple/b3ituple.hxx rename to include/basegfx/tuple/b3ituple.hxx diff --git a/basegfx/inc/basegfx/vector/b2dsize.hxx b/include/basegfx/vector/b2dsize.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b2dsize.hxx rename to include/basegfx/vector/b2dsize.hxx diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b2dvector.hxx rename to include/basegfx/vector/b2dvector.hxx diff --git a/basegfx/inc/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b2enums.hxx rename to include/basegfx/vector/b2enums.hxx diff --git a/basegfx/inc/basegfx/vector/b2isize.hxx b/include/basegfx/vector/b2isize.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b2isize.hxx rename to include/basegfx/vector/b2isize.hxx diff --git a/basegfx/inc/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b2ivector.hxx rename to include/basegfx/vector/b2ivector.hxx diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b3dvector.hxx rename to include/basegfx/vector/b3dvector.hxx diff --git a/basegfx/inc/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx similarity index 100% rename from basegfx/inc/basegfx/vector/b3ivector.hxx rename to include/basegfx/vector/b3ivector.hxx diff --git a/basic/inc/basic/basicdllapi.h b/include/basic/basicdllapi.h similarity index 100% rename from basic/inc/basic/basicdllapi.h rename to include/basic/basicdllapi.h diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx similarity index 100% rename from basic/inc/basic/basicmanagerrepository.hxx rename to include/basic/basicmanagerrepository.hxx diff --git a/basic/inc/basic/basmgr.hxx b/include/basic/basmgr.hxx similarity index 100% rename from basic/inc/basic/basmgr.hxx rename to include/basic/basmgr.hxx diff --git a/basic/inc/basic/basrdll.hxx b/include/basic/basrdll.hxx similarity index 100% rename from basic/inc/basic/basrdll.hxx rename to include/basic/basrdll.hxx diff --git a/basic/inc/basic/global.hxx b/include/basic/global.hxx similarity index 100% rename from basic/inc/basic/global.hxx rename to include/basic/global.hxx diff --git a/basic/inc/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx similarity index 100% rename from basic/inc/basic/modsizeexceeded.hxx rename to include/basic/modsizeexceeded.hxx diff --git a/basic/inc/basic/sbdef.hxx b/include/basic/sbdef.hxx similarity index 100% rename from basic/inc/basic/sbdef.hxx rename to include/basic/sbdef.hxx diff --git a/basic/inc/basic/sberrors.hxx b/include/basic/sberrors.hxx similarity index 100% rename from basic/inc/basic/sberrors.hxx rename to include/basic/sberrors.hxx diff --git a/basic/inc/basic/sbmeth.hxx b/include/basic/sbmeth.hxx similarity index 100% rename from basic/inc/basic/sbmeth.hxx rename to include/basic/sbmeth.hxx diff --git a/basic/inc/basic/sbmod.hxx b/include/basic/sbmod.hxx similarity index 100% rename from basic/inc/basic/sbmod.hxx rename to include/basic/sbmod.hxx diff --git a/basic/inc/basic/sbobjmod.hxx b/include/basic/sbobjmod.hxx similarity index 100% rename from basic/inc/basic/sbobjmod.hxx rename to include/basic/sbobjmod.hxx diff --git a/basic/inc/basic/sbprop.hxx b/include/basic/sbprop.hxx similarity index 100% rename from basic/inc/basic/sbprop.hxx rename to include/basic/sbprop.hxx diff --git a/basic/inc/basic/sbstar.hxx b/include/basic/sbstar.hxx similarity index 100% rename from basic/inc/basic/sbstar.hxx rename to include/basic/sbstar.hxx diff --git a/basic/inc/basic/sbstdobj.hxx b/include/basic/sbstdobj.hxx similarity index 100% rename from basic/inc/basic/sbstdobj.hxx rename to include/basic/sbstdobj.hxx diff --git a/basic/inc/basic/sbuno.hxx b/include/basic/sbuno.hxx similarity index 100% rename from basic/inc/basic/sbuno.hxx rename to include/basic/sbuno.hxx diff --git a/basic/inc/basic/sbx.hxx b/include/basic/sbx.hxx similarity index 100% rename from basic/inc/basic/sbx.hxx rename to include/basic/sbx.hxx diff --git a/basic/inc/basic/sbxbase.hxx b/include/basic/sbxbase.hxx similarity index 100% rename from basic/inc/basic/sbxbase.hxx rename to include/basic/sbxbase.hxx diff --git a/basic/inc/basic/sbxcore.hxx b/include/basic/sbxcore.hxx similarity index 100% rename from basic/inc/basic/sbxcore.hxx rename to include/basic/sbxcore.hxx diff --git a/basic/inc/basic/sbxdef.hxx b/include/basic/sbxdef.hxx similarity index 100% rename from basic/inc/basic/sbxdef.hxx rename to include/basic/sbxdef.hxx diff --git a/basic/inc/basic/sbxfac.hxx b/include/basic/sbxfac.hxx similarity index 100% rename from basic/inc/basic/sbxfac.hxx rename to include/basic/sbxfac.hxx diff --git a/basic/inc/basic/sbxform.hxx b/include/basic/sbxform.hxx similarity index 100% rename from basic/inc/basic/sbxform.hxx rename to include/basic/sbxform.hxx diff --git a/basic/inc/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx similarity index 100% rename from basic/inc/basic/sbxmeth.hxx rename to include/basic/sbxmeth.hxx diff --git a/basic/inc/basic/sbxobj.hxx b/include/basic/sbxobj.hxx similarity index 100% rename from basic/inc/basic/sbxobj.hxx rename to include/basic/sbxobj.hxx diff --git a/basic/inc/basic/sbxprop.hxx b/include/basic/sbxprop.hxx similarity index 100% rename from basic/inc/basic/sbxprop.hxx rename to include/basic/sbxprop.hxx diff --git a/basic/inc/basic/sbxvar.hxx b/include/basic/sbxvar.hxx similarity index 100% rename from basic/inc/basic/sbxvar.hxx rename to include/basic/sbxvar.hxx diff --git a/basic/inc/basic/vbahelper.hxx b/include/basic/vbahelper.hxx similarity index 100% rename from basic/inc/basic/vbahelper.hxx rename to include/basic/vbahelper.hxx diff --git a/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx similarity index 100% rename from canvas/inc/canvas/base/bitmapcanvasbase.hxx rename to include/canvas/base/bitmapcanvasbase.hxx diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx similarity index 100% rename from canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx rename to include/canvas/base/bufferedgraphicdevicebase.hxx diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx similarity index 100% rename from canvas/inc/canvas/base/cachedprimitivebase.hxx rename to include/canvas/base/cachedprimitivebase.hxx diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx similarity index 100% rename from canvas/inc/canvas/base/canvasbase.hxx rename to include/canvas/base/canvasbase.hxx diff --git a/canvas/inc/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx similarity index 100% rename from canvas/inc/canvas/base/canvascustomspritebase.hxx rename to include/canvas/base/canvascustomspritebase.hxx diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx similarity index 100% rename from canvas/inc/canvas/base/canvascustomspritehelper.hxx rename to include/canvas/base/canvascustomspritehelper.hxx diff --git a/canvas/inc/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx similarity index 100% rename from canvas/inc/canvas/base/disambiguationhelper.hxx rename to include/canvas/base/disambiguationhelper.hxx diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx similarity index 100% rename from canvas/inc/canvas/base/graphicdevicebase.hxx rename to include/canvas/base/graphicdevicebase.hxx diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx similarity index 100% rename from canvas/inc/canvas/base/integerbitmapbase.hxx rename to include/canvas/base/integerbitmapbase.hxx diff --git a/canvas/inc/canvas/base/sprite.hxx b/include/canvas/base/sprite.hxx similarity index 100% rename from canvas/inc/canvas/base/sprite.hxx rename to include/canvas/base/sprite.hxx diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx similarity index 100% rename from canvas/inc/canvas/base/spritecanvasbase.hxx rename to include/canvas/base/spritecanvasbase.hxx diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/include/canvas/base/spritesurface.hxx similarity index 100% rename from canvas/inc/canvas/base/spritesurface.hxx rename to include/canvas/base/spritesurface.hxx diff --git a/canvas/inc/canvas/canvastools.hxx b/include/canvas/canvastools.hxx similarity index 100% rename from canvas/inc/canvas/canvastools.hxx rename to include/canvas/canvastools.hxx diff --git a/canvas/inc/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h similarity index 100% rename from canvas/inc/canvas/canvastoolsdllapi.h rename to include/canvas/canvastoolsdllapi.h diff --git a/canvas/inc/canvas/debug.hxx b/include/canvas/debug.hxx similarity index 100% rename from canvas/inc/canvas/debug.hxx rename to include/canvas/debug.hxx diff --git a/canvas/inc/canvas/elapsedtime.hxx b/include/canvas/elapsedtime.hxx similarity index 100% rename from canvas/inc/canvas/elapsedtime.hxx rename to include/canvas/elapsedtime.hxx diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx similarity index 100% rename from canvas/inc/canvas/parametricpolypolygon.hxx rename to include/canvas/parametricpolypolygon.hxx diff --git a/canvas/inc/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx similarity index 100% rename from canvas/inc/canvas/propertysethelper.hxx rename to include/canvas/propertysethelper.hxx diff --git a/canvas/inc/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx similarity index 100% rename from canvas/inc/canvas/rendering/bitmap.hxx rename to include/canvas/rendering/bitmap.hxx diff --git a/canvas/inc/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx similarity index 100% rename from canvas/inc/canvas/rendering/icachedprimitive.hxx rename to include/canvas/rendering/icachedprimitive.hxx diff --git a/canvas/inc/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx similarity index 100% rename from canvas/inc/canvas/rendering/icolorbuffer.hxx rename to include/canvas/rendering/icolorbuffer.hxx diff --git a/canvas/inc/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx similarity index 100% rename from canvas/inc/canvas/rendering/irendermodule.hxx rename to include/canvas/rendering/irendermodule.hxx diff --git a/canvas/inc/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx similarity index 100% rename from canvas/inc/canvas/rendering/isurface.hxx rename to include/canvas/rendering/isurface.hxx diff --git a/canvas/inc/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx similarity index 100% rename from canvas/inc/canvas/rendering/isurfaceproxy.hxx rename to include/canvas/rendering/isurfaceproxy.hxx diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx similarity index 100% rename from canvas/inc/canvas/rendering/isurfaceproxymanager.hxx rename to include/canvas/rendering/isurfaceproxymanager.hxx diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx similarity index 100% rename from canvas/inc/canvas/spriteredrawmanager.hxx rename to include/canvas/spriteredrawmanager.hxx diff --git a/canvas/inc/canvas/vclwrapper.hxx b/include/canvas/vclwrapper.hxx similarity index 100% rename from canvas/inc/canvas/vclwrapper.hxx rename to include/canvas/vclwrapper.hxx diff --git a/canvas/inc/canvas/verbosetrace.hxx b/include/canvas/verbosetrace.hxx similarity index 100% rename from canvas/inc/canvas/verbosetrace.hxx rename to include/canvas/verbosetrace.hxx diff --git a/canvas/inc/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx similarity index 100% rename from canvas/inc/canvas/verifyinput.hxx rename to include/canvas/verifyinput.hxx diff --git a/codemaker/inc/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx similarity index 100% rename from codemaker/inc/codemaker/codemaker.hxx rename to include/codemaker/codemaker.hxx diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx similarity index 100% rename from codemaker/inc/codemaker/commoncpp.hxx rename to include/codemaker/commoncpp.hxx diff --git a/codemaker/inc/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx similarity index 100% rename from codemaker/inc/codemaker/commonjava.hxx rename to include/codemaker/commonjava.hxx diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx similarity index 100% rename from codemaker/inc/codemaker/exceptiontree.hxx rename to include/codemaker/exceptiontree.hxx diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx similarity index 100% rename from codemaker/inc/codemaker/generatedtypeset.hxx rename to include/codemaker/generatedtypeset.hxx diff --git a/codemaker/inc/codemaker/global.hxx b/include/codemaker/global.hxx similarity index 100% rename from codemaker/inc/codemaker/global.hxx rename to include/codemaker/global.hxx diff --git a/codemaker/inc/codemaker/options.hxx b/include/codemaker/options.hxx similarity index 100% rename from codemaker/inc/codemaker/options.hxx rename to include/codemaker/options.hxx diff --git a/codemaker/inc/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx similarity index 100% rename from codemaker/inc/codemaker/typemanager.hxx rename to include/codemaker/typemanager.hxx diff --git a/codemaker/inc/codemaker/unotype.hxx b/include/codemaker/unotype.hxx similarity index 100% rename from codemaker/inc/codemaker/unotype.hxx rename to include/codemaker/unotype.hxx diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx similarity index 100% rename from comphelper/inc/comphelper/ChainablePropertySet.hxx rename to include/comphelper/ChainablePropertySet.hxx diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx similarity index 100% rename from comphelper/inc/comphelper/ChainablePropertySetInfo.hxx rename to include/comphelper/ChainablePropertySetInfo.hxx diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx similarity index 100% rename from comphelper/inc/comphelper/IdPropArrayHelper.hxx rename to include/comphelper/IdPropArrayHelper.hxx diff --git a/comphelper/inc/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx similarity index 100% rename from comphelper/inc/comphelper/InlineContainer.hxx rename to include/comphelper/InlineContainer.hxx diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx similarity index 100% rename from comphelper/inc/comphelper/MasterPropertySet.hxx rename to include/comphelper/MasterPropertySet.hxx diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx similarity index 100% rename from comphelper/inc/comphelper/MasterPropertySetInfo.hxx rename to include/comphelper/MasterPropertySetInfo.hxx diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx similarity index 100% rename from comphelper/inc/comphelper/PropertyInfoHash.hxx rename to include/comphelper/PropertyInfoHash.hxx diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx similarity index 100% rename from comphelper/inc/comphelper/SelectionMultiplex.hxx rename to include/comphelper/SelectionMultiplex.hxx diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx similarity index 100% rename from comphelper/inc/comphelper/SettingsHelper.hxx rename to include/comphelper/SettingsHelper.hxx diff --git a/comphelper/inc/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx similarity index 100% rename from comphelper/inc/comphelper/TypeGeneration.hxx rename to include/comphelper/TypeGeneration.hxx diff --git a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessiblecomponenthelper.hxx rename to include/comphelper/accessiblecomponenthelper.hxx diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessiblecontexthelper.hxx rename to include/comphelper/accessiblecontexthelper.hxx diff --git a/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx similarity index 100% rename from comphelper/inc/comphelper/accessibleeventnotifier.hxx rename to include/comphelper/accessibleeventnotifier.hxx diff --git a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessiblekeybindinghelper.hxx rename to include/comphelper/accessiblekeybindinghelper.hxx diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessibleselectionhelper.hxx rename to include/comphelper/accessibleselectionhelper.hxx diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessibletexthelper.hxx rename to include/comphelper/accessibletexthelper.hxx diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx similarity index 100% rename from comphelper/inc/comphelper/accessiblewrapper.hxx rename to include/comphelper/accessiblewrapper.hxx diff --git a/comphelper/inc/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx similarity index 100% rename from comphelper/inc/comphelper/accimplaccess.hxx rename to include/comphelper/accimplaccess.hxx diff --git a/comphelper/inc/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx similarity index 100% rename from comphelper/inc/comphelper/anycompare.hxx rename to include/comphelper/anycompare.hxx diff --git a/comphelper/inc/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx similarity index 100% rename from comphelper/inc/comphelper/anytostring.hxx rename to include/comphelper/anytostring.hxx diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx similarity index 100% rename from comphelper/inc/comphelper/asyncnotification.hxx rename to include/comphelper/asyncnotification.hxx diff --git a/comphelper/inc/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx similarity index 100% rename from comphelper/inc/comphelper/attributelist.hxx rename to include/comphelper/attributelist.hxx diff --git a/comphelper/inc/comphelper/basicio.hxx b/include/comphelper/basicio.hxx similarity index 100% rename from comphelper/inc/comphelper/basicio.hxx rename to include/comphelper/basicio.hxx diff --git a/comphelper/inc/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx similarity index 100% rename from comphelper/inc/comphelper/broadcasthelper.hxx rename to include/comphelper/broadcasthelper.hxx diff --git a/comphelper/inc/comphelper/classids.hxx b/include/comphelper/classids.hxx similarity index 100% rename from comphelper/inc/comphelper/classids.hxx rename to include/comphelper/classids.hxx diff --git a/comphelper/inc/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h similarity index 100% rename from comphelper/inc/comphelper/comphelperdllapi.h rename to include/comphelper/comphelperdllapi.h diff --git a/comphelper/inc/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx similarity index 100% rename from comphelper/inc/comphelper/componentbase.hxx rename to include/comphelper/componentbase.hxx diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/include/comphelper/componentcontext.hxx similarity index 100% rename from comphelper/inc/comphelper/componentcontext.hxx rename to include/comphelper/componentcontext.hxx diff --git a/comphelper/inc/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx similarity index 100% rename from comphelper/inc/comphelper/componentguard.hxx rename to include/comphelper/componentguard.hxx diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx similarity index 100% rename from comphelper/inc/comphelper/componentmodule.hxx rename to include/comphelper/componentmodule.hxx diff --git a/comphelper/inc/comphelper/configuration.hxx b/include/comphelper/configuration.hxx similarity index 100% rename from comphelper/inc/comphelper/configuration.hxx rename to include/comphelper/configuration.hxx diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/configurationhelper.hxx rename to include/comphelper/configurationhelper.hxx diff --git a/comphelper/inc/comphelper/container.hxx b/include/comphelper/container.hxx similarity index 100% rename from comphelper/inc/comphelper/container.hxx rename to include/comphelper/container.hxx diff --git a/comphelper/inc/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx similarity index 100% rename from comphelper/inc/comphelper/containermultiplexer.hxx rename to include/comphelper/containermultiplexer.hxx diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/docpasswordhelper.hxx rename to include/comphelper/docpasswordhelper.hxx diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx similarity index 100% rename from comphelper/inc/comphelper/docpasswordrequest.hxx rename to include/comphelper/docpasswordrequest.hxx diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx similarity index 100% rename from comphelper/inc/comphelper/documentconstants.hxx rename to include/comphelper/documentconstants.hxx diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx similarity index 100% rename from comphelper/inc/comphelper/documentinfo.hxx rename to include/comphelper/documentinfo.hxx diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx similarity index 100% rename from comphelper/inc/comphelper/embeddedobjectcontainer.hxx rename to include/comphelper/embeddedobjectcontainer.hxx diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/enumhelper.hxx rename to include/comphelper/enumhelper.hxx diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx similarity index 100% rename from comphelper/inc/comphelper/eventattachermgr.hxx rename to include/comphelper/eventattachermgr.hxx diff --git a/comphelper/inc/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx similarity index 100% rename from comphelper/inc/comphelper/evtlistenerhlp.hxx rename to include/comphelper/evtlistenerhlp.hxx diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/include/comphelper/evtmethodhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/evtmethodhelper.hxx rename to include/comphelper/evtmethodhelper.hxx diff --git a/comphelper/inc/comphelper/extract.hxx b/include/comphelper/extract.hxx similarity index 100% rename from comphelper/inc/comphelper/extract.hxx rename to include/comphelper/extract.hxx diff --git a/comphelper/inc/comphelper/fileformat.h b/include/comphelper/fileformat.h similarity index 100% rename from comphelper/inc/comphelper/fileformat.h rename to include/comphelper/fileformat.h diff --git a/comphelper/inc/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx similarity index 100% rename from comphelper/inc/comphelper/flagguard.hxx rename to include/comphelper/flagguard.hxx diff --git a/comphelper/inc/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx similarity index 100% rename from comphelper/inc/comphelper/genericpropertyset.hxx rename to include/comphelper/genericpropertyset.hxx diff --git a/comphelper/inc/comphelper/guarding.hxx b/include/comphelper/guarding.hxx similarity index 100% rename from comphelper/inc/comphelper/guarding.hxx rename to include/comphelper/guarding.hxx diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx similarity index 100% rename from comphelper/inc/comphelper/ihwrapnofilter.hxx rename to include/comphelper/ihwrapnofilter.hxx diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/include/comphelper/implbase_var.hxx similarity index 100% rename from comphelper/inc/comphelper/implbase_var.hxx rename to include/comphelper/implbase_var.hxx diff --git a/comphelper/inc/comphelper/implementationreference.hxx b/include/comphelper/implementationreference.hxx similarity index 100% rename from comphelper/inc/comphelper/implementationreference.hxx rename to include/comphelper/implementationreference.hxx diff --git a/comphelper/inc/comphelper/interaction.hxx b/include/comphelper/interaction.hxx similarity index 100% rename from comphelper/inc/comphelper/interaction.hxx rename to include/comphelper/interaction.hxx diff --git a/comphelper/inc/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx similarity index 100% rename from comphelper/inc/comphelper/listenernotification.hxx rename to include/comphelper/listenernotification.hxx diff --git a/comphelper/inc/comphelper/logging.hxx b/include/comphelper/logging.hxx similarity index 100% rename from comphelper/inc/comphelper/logging.hxx rename to include/comphelper/logging.hxx diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx similarity index 100% rename from comphelper/inc/comphelper/make_shared_from_uno.hxx rename to include/comphelper/make_shared_from_uno.hxx diff --git a/comphelper/inc/comphelper/makesequence.hxx b/include/comphelper/makesequence.hxx similarity index 100% rename from comphelper/inc/comphelper/makesequence.hxx rename to include/comphelper/makesequence.hxx diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/include/comphelper/mediadescriptor.hxx similarity index 100% rename from comphelper/inc/comphelper/mediadescriptor.hxx rename to include/comphelper/mediadescriptor.hxx diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx similarity index 100% rename from comphelper/inc/comphelper/mimeconfighelper.hxx rename to include/comphelper/mimeconfighelper.hxx diff --git a/comphelper/inc/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx similarity index 100% rename from comphelper/inc/comphelper/namecontainer.hxx rename to include/comphelper/namecontainer.hxx diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx similarity index 100% rename from comphelper/inc/comphelper/namedvaluecollection.hxx rename to include/comphelper/namedvaluecollection.hxx diff --git a/comphelper/inc/comphelper/newarray.hxx b/include/comphelper/newarray.hxx similarity index 100% rename from comphelper/inc/comphelper/newarray.hxx rename to include/comphelper/newarray.hxx diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx similarity index 100% rename from comphelper/inc/comphelper/numberedcollection.hxx rename to include/comphelper/numberedcollection.hxx diff --git a/comphelper/inc/comphelper/numbers.hxx b/include/comphelper/numbers.hxx similarity index 100% rename from comphelper/inc/comphelper/numbers.hxx rename to include/comphelper/numbers.hxx diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx similarity index 100% rename from comphelper/inc/comphelper/officeresourcebundle.hxx rename to include/comphelper/officeresourcebundle.hxx diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/ofopxmlhelper.hxx rename to include/comphelper/ofopxmlhelper.hxx diff --git a/comphelper/inc/comphelper/optional.hxx b/include/comphelper/optional.hxx similarity index 100% rename from comphelper/inc/comphelper/optional.hxx rename to include/comphelper/optional.hxx diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx similarity index 100% rename from comphelper/inc/comphelper/oslfile2streamwrap.hxx rename to include/comphelper/oslfile2streamwrap.hxx diff --git a/comphelper/inc/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx similarity index 100% rename from comphelper/inc/comphelper/processfactory.hxx rename to include/comphelper/processfactory.hxx diff --git a/comphelper/inc/comphelper/propagg.hxx b/include/comphelper/propagg.hxx similarity index 100% rename from comphelper/inc/comphelper/propagg.hxx rename to include/comphelper/propagg.hxx diff --git a/comphelper/inc/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx similarity index 100% rename from comphelper/inc/comphelper/proparrhlp.hxx rename to include/comphelper/proparrhlp.hxx diff --git a/comphelper/inc/comphelper/property.hxx b/include/comphelper/property.hxx similarity index 100% rename from comphelper/inc/comphelper/property.hxx rename to include/comphelper/property.hxx diff --git a/comphelper/inc/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx similarity index 100% rename from comphelper/inc/comphelper/propertybag.hxx rename to include/comphelper/propertybag.hxx diff --git a/comphelper/inc/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx similarity index 100% rename from comphelper/inc/comphelper/propertycontainer.hxx rename to include/comphelper/propertycontainer.hxx diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx similarity index 100% rename from comphelper/inc/comphelper/propertycontainerhelper.hxx rename to include/comphelper/propertycontainerhelper.hxx diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx similarity index 100% rename from comphelper/inc/comphelper/propertysethelper.hxx rename to include/comphelper/propertysethelper.hxx diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx similarity index 100% rename from comphelper/inc/comphelper/propertysetinfo.hxx rename to include/comphelper/propertysetinfo.hxx diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx similarity index 100% rename from comphelper/inc/comphelper/propertystatecontainer.hxx rename to include/comphelper/propertystatecontainer.hxx diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx similarity index 100% rename from comphelper/inc/comphelper/propmultiplex.hxx rename to include/comphelper/propmultiplex.hxx diff --git a/comphelper/inc/comphelper/propstate.hxx b/include/comphelper/propstate.hxx similarity index 100% rename from comphelper/inc/comphelper/propstate.hxx rename to include/comphelper/propstate.hxx diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx similarity index 100% rename from comphelper/inc/comphelper/proxyaggregation.hxx rename to include/comphelper/proxyaggregation.hxx diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx similarity index 100% rename from comphelper/inc/comphelper/scoped_disposing_ptr.hxx rename to include/comphelper/scoped_disposing_ptr.hxx diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx similarity index 100% rename from comphelper/inc/comphelper/scopeguard.hxx rename to include/comphelper/scopeguard.hxx diff --git a/comphelper/inc/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx similarity index 100% rename from comphelper/inc/comphelper/seekableinput.hxx rename to include/comphelper/seekableinput.hxx diff --git a/comphelper/inc/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx similarity index 100% rename from comphelper/inc/comphelper/seqstream.hxx rename to include/comphelper/seqstream.hxx diff --git a/comphelper/inc/comphelper/sequence.hxx b/include/comphelper/sequence.hxx similarity index 100% rename from comphelper/inc/comphelper/sequence.hxx rename to include/comphelper/sequence.hxx diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx similarity index 100% rename from comphelper/inc/comphelper/sequenceashashmap.hxx rename to include/comphelper/sequenceashashmap.hxx diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/include/comphelper/sequenceasvector.hxx similarity index 100% rename from comphelper/inc/comphelper/sequenceasvector.hxx rename to include/comphelper/sequenceasvector.hxx diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx similarity index 100% rename from comphelper/inc/comphelper/servicedecl.hxx rename to include/comphelper/servicedecl.hxx diff --git a/comphelper/inc/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx similarity index 100% rename from comphelper/inc/comphelper/servicehelper.hxx rename to include/comphelper/servicehelper.hxx diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx similarity index 100% rename from comphelper/inc/comphelper/serviceinfohelper.hxx rename to include/comphelper/serviceinfohelper.hxx diff --git a/comphelper/inc/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx similarity index 100% rename from comphelper/inc/comphelper/sharedmutex.hxx rename to include/comphelper/sharedmutex.hxx diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx similarity index 100% rename from comphelper/inc/comphelper/stillreadwriteinteraction.hxx rename to include/comphelper/stillreadwriteinteraction.hxx diff --git a/comphelper/inc/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx similarity index 100% rename from comphelper/inc/comphelper/stl_types.hxx rename to include/comphelper/stl_types.hxx diff --git a/comphelper/inc/comphelper/stlunosequence.hxx b/include/comphelper/stlunosequence.hxx similarity index 100% rename from comphelper/inc/comphelper/stlunosequence.hxx rename to include/comphelper/stlunosequence.hxx diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx similarity index 100% rename from comphelper/inc/comphelper/storagehelper.hxx rename to include/comphelper/storagehelper.hxx diff --git a/comphelper/inc/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx similarity index 100% rename from comphelper/inc/comphelper/streamsection.hxx rename to include/comphelper/streamsection.hxx diff --git a/comphelper/inc/comphelper/string.hxx b/include/comphelper/string.hxx similarity index 100% rename from comphelper/inc/comphelper/string.hxx rename to include/comphelper/string.hxx diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx similarity index 100% rename from comphelper/inc/comphelper/synchronousdispatch.hxx rename to include/comphelper/synchronousdispatch.hxx diff --git a/comphelper/inc/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx similarity index 100% rename from comphelper/inc/comphelper/syntaxhighlight.hxx rename to include/comphelper/syntaxhighlight.hxx diff --git a/comphelper/inc/comphelper/types.hxx b/include/comphelper/types.hxx similarity index 100% rename from comphelper/inc/comphelper/types.hxx rename to include/comphelper/types.hxx diff --git a/comphelper/inc/comphelper/uno3.hxx b/include/comphelper/uno3.hxx similarity index 100% rename from comphelper/inc/comphelper/uno3.hxx rename to include/comphelper/uno3.hxx diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx similarity index 100% rename from comphelper/inc/comphelper/unwrapargs.hxx rename to include/comphelper/unwrapargs.hxx diff --git a/comphelper/inc/comphelper/weak.hxx b/include/comphelper/weak.hxx similarity index 100% rename from comphelper/inc/comphelper/weak.hxx rename to include/comphelper/weak.hxx diff --git a/comphelper/inc/comphelper/weakbag.hxx b/include/comphelper/weakbag.hxx similarity index 100% rename from comphelper/inc/comphelper/weakbag.hxx rename to include/comphelper/weakbag.hxx diff --git a/comphelper/inc/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx similarity index 100% rename from comphelper/inc/comphelper/weakeventlistener.hxx rename to include/comphelper/weakeventlistener.hxx diff --git a/comphelper/inc/comphelper/xmltools.hxx b/include/comphelper/xmltools.hxx similarity index 100% rename from comphelper/inc/comphelper/xmltools.hxx rename to include/comphelper/xmltools.hxx diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx similarity index 100% rename from connectivity/inc/connectivity/BlobHelper.hxx rename to include/connectivity/BlobHelper.hxx diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx similarity index 100% rename from connectivity/inc/connectivity/CommonTools.hxx rename to include/connectivity/CommonTools.hxx diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx similarity index 100% rename from connectivity/inc/connectivity/ConnectionWrapper.hxx rename to include/connectivity/ConnectionWrapper.hxx diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx similarity index 100% rename from connectivity/inc/connectivity/DriversConfig.hxx rename to include/connectivity/DriversConfig.hxx diff --git a/connectivity/inc/connectivity/FValue.hxx b/include/connectivity/FValue.hxx similarity index 100% rename from connectivity/inc/connectivity/FValue.hxx rename to include/connectivity/FValue.hxx diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx similarity index 100% rename from connectivity/inc/connectivity/IParseContext.hxx rename to include/connectivity/IParseContext.hxx diff --git a/connectivity/inc/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx similarity index 100% rename from connectivity/inc/connectivity/OSubComponent.hxx rename to include/connectivity/OSubComponent.hxx diff --git a/connectivity/inc/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx similarity index 100% rename from connectivity/inc/connectivity/PColumn.hxx rename to include/connectivity/PColumn.hxx diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx similarity index 100% rename from connectivity/inc/connectivity/ParameterCont.hxx rename to include/connectivity/ParameterCont.hxx diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx similarity index 100% rename from connectivity/inc/connectivity/SQLStatementHelper.hxx rename to include/connectivity/SQLStatementHelper.hxx diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx similarity index 100% rename from connectivity/inc/connectivity/StdTypeDefs.hxx rename to include/connectivity/StdTypeDefs.hxx diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx similarity index 100% rename from connectivity/inc/connectivity/TColumnsHelper.hxx rename to include/connectivity/TColumnsHelper.hxx diff --git a/connectivity/inc/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx similarity index 100% rename from connectivity/inc/connectivity/TIndex.hxx rename to include/connectivity/TIndex.hxx diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx similarity index 100% rename from connectivity/inc/connectivity/TIndexColumns.hxx rename to include/connectivity/TIndexColumns.hxx diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx similarity index 100% rename from connectivity/inc/connectivity/TIndexes.hxx rename to include/connectivity/TIndexes.hxx diff --git a/connectivity/inc/connectivity/TKey.hxx b/include/connectivity/TKey.hxx similarity index 100% rename from connectivity/inc/connectivity/TKey.hxx rename to include/connectivity/TKey.hxx diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx similarity index 100% rename from connectivity/inc/connectivity/TKeyColumns.hxx rename to include/connectivity/TKeyColumns.hxx diff --git a/connectivity/inc/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx similarity index 100% rename from connectivity/inc/connectivity/TKeys.hxx rename to include/connectivity/TKeys.hxx diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx similarity index 100% rename from connectivity/inc/connectivity/TTableHelper.hxx rename to include/connectivity/TTableHelper.hxx diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx similarity index 100% rename from connectivity/inc/connectivity/conncleanup.hxx rename to include/connectivity/conncleanup.hxx diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx similarity index 100% rename from connectivity/inc/connectivity/dbcharset.hxx rename to include/connectivity/dbcharset.hxx diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx similarity index 100% rename from connectivity/inc/connectivity/dbconversion.hxx rename to include/connectivity/dbconversion.hxx diff --git a/connectivity/inc/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx similarity index 100% rename from connectivity/inc/connectivity/dbexception.hxx rename to include/connectivity/dbexception.hxx diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx similarity index 100% rename from connectivity/inc/connectivity/dbmetadata.hxx rename to include/connectivity/dbmetadata.hxx diff --git a/connectivity/inc/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx similarity index 100% rename from connectivity/inc/connectivity/dbtools.hxx rename to include/connectivity/dbtools.hxx diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/include/connectivity/dbtoolsdllapi.hxx similarity index 100% rename from connectivity/inc/connectivity/dbtoolsdllapi.hxx rename to include/connectivity/dbtoolsdllapi.hxx diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx similarity index 100% rename from connectivity/inc/connectivity/filtermanager.hxx rename to include/connectivity/filtermanager.hxx diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx similarity index 100% rename from connectivity/inc/connectivity/formattedcolumnvalue.hxx rename to include/connectivity/formattedcolumnvalue.hxx diff --git a/connectivity/inc/connectivity/parameters.hxx b/include/connectivity/parameters.hxx similarity index 100% rename from connectivity/inc/connectivity/parameters.hxx rename to include/connectivity/parameters.hxx diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx similarity index 100% rename from connectivity/inc/connectivity/paramwrapper.hxx rename to include/connectivity/paramwrapper.hxx diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx similarity index 100% rename from connectivity/inc/connectivity/predicateinput.hxx rename to include/connectivity/predicateinput.hxx diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/IRefreshable.hxx rename to include/connectivity/sdbcx/IRefreshable.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VCatalog.hxx rename to include/connectivity/sdbcx/VCatalog.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VCollection.hxx rename to include/connectivity/sdbcx/VCollection.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VColumn.hxx rename to include/connectivity/sdbcx/VColumn.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VDescriptor.hxx rename to include/connectivity/sdbcx/VDescriptor.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VGroup.hxx rename to include/connectivity/sdbcx/VGroup.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VIndex.hxx rename to include/connectivity/sdbcx/VIndex.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx rename to include/connectivity/sdbcx/VIndexColumn.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VKey.hxx rename to include/connectivity/sdbcx/VKey.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx rename to include/connectivity/sdbcx/VKeyColumn.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VTable.hxx rename to include/connectivity/sdbcx/VTable.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VTypeDef.hxx rename to include/connectivity/sdbcx/VTypeDef.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VUser.hxx rename to include/connectivity/sdbcx/VUser.hxx diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx similarity index 100% rename from connectivity/inc/connectivity/sdbcx/VView.hxx rename to include/connectivity/sdbcx/VView.hxx diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx similarity index 100% rename from connectivity/inc/connectivity/sqlerror.hxx rename to include/connectivity/sqlerror.hxx diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx similarity index 100% rename from connectivity/inc/connectivity/sqliterator.hxx rename to include/connectivity/sqliterator.hxx diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx similarity index 100% rename from connectivity/inc/connectivity/sqlnode.hxx rename to include/connectivity/sqlnode.hxx diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx similarity index 100% rename from connectivity/inc/connectivity/sqlparse.hxx rename to include/connectivity/sqlparse.hxx diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx similarity index 100% rename from connectivity/inc/connectivity/standardsqlstate.hxx rename to include/connectivity/standardsqlstate.hxx diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx similarity index 100% rename from connectivity/inc/connectivity/statementcomposer.hxx rename to include/connectivity/statementcomposer.hxx diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx similarity index 100% rename from connectivity/inc/connectivity/virtualdbtools.hxx rename to include/connectivity/virtualdbtools.hxx diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx similarity index 100% rename from connectivity/inc/connectivity/warningscontainer.hxx rename to include/connectivity/warningscontainer.hxx diff --git a/cosv/inc/cosv/bstream.hxx b/include/cosv/bstream.hxx similarity index 100% rename from cosv/inc/cosv/bstream.hxx rename to include/cosv/bstream.hxx diff --git a/cosv/inc/cosv/comdline.hxx b/include/cosv/comdline.hxx similarity index 100% rename from cosv/inc/cosv/comdline.hxx rename to include/cosv/comdline.hxx diff --git a/cosv/inc/cosv/comfunc.hxx b/include/cosv/comfunc.hxx similarity index 100% rename from cosv/inc/cosv/comfunc.hxx rename to include/cosv/comfunc.hxx diff --git a/cosv/inc/cosv/csv_env.hxx b/include/cosv/csv_env.hxx similarity index 100% rename from cosv/inc/cosv/csv_env.hxx rename to include/cosv/csv_env.hxx diff --git a/cosv/inc/cosv/csv_ostream.hxx b/include/cosv/csv_ostream.hxx similarity index 100% rename from cosv/inc/cosv/csv_ostream.hxx rename to include/cosv/csv_ostream.hxx diff --git a/cosv/inc/cosv/csv_precomp.h b/include/cosv/csv_precomp.h similarity index 100% rename from cosv/inc/cosv/csv_precomp.h rename to include/cosv/csv_precomp.h diff --git a/cosv/inc/cosv/dirchain.hxx b/include/cosv/dirchain.hxx similarity index 100% rename from cosv/inc/cosv/dirchain.hxx rename to include/cosv/dirchain.hxx diff --git a/cosv/inc/cosv/file.hxx b/include/cosv/file.hxx similarity index 100% rename from cosv/inc/cosv/file.hxx rename to include/cosv/file.hxx diff --git a/cosv/inc/cosv/openclose.hxx b/include/cosv/openclose.hxx similarity index 100% rename from cosv/inc/cosv/openclose.hxx rename to include/cosv/openclose.hxx diff --git a/cosv/inc/cosv/persist.hxx b/include/cosv/persist.hxx similarity index 100% rename from cosv/inc/cosv/persist.hxx rename to include/cosv/persist.hxx diff --git a/cosv/inc/cosv/ploc.hxx b/include/cosv/ploc.hxx similarity index 100% rename from cosv/inc/cosv/ploc.hxx rename to include/cosv/ploc.hxx diff --git a/cosv/inc/cosv/ploc_dir.hxx b/include/cosv/ploc_dir.hxx similarity index 100% rename from cosv/inc/cosv/ploc_dir.hxx rename to include/cosv/ploc_dir.hxx diff --git a/cosv/inc/cosv/plocroot.hxx b/include/cosv/plocroot.hxx similarity index 100% rename from cosv/inc/cosv/plocroot.hxx rename to include/cosv/plocroot.hxx diff --git a/cosv/inc/cosv/std_outp.hxx b/include/cosv/std_outp.hxx similarity index 100% rename from cosv/inc/cosv/std_outp.hxx rename to include/cosv/std_outp.hxx diff --git a/cosv/inc/cosv/str_types.hxx b/include/cosv/str_types.hxx similarity index 100% rename from cosv/inc/cosv/str_types.hxx rename to include/cosv/str_types.hxx diff --git a/cosv/inc/cosv/streamstr.hxx b/include/cosv/streamstr.hxx similarity index 100% rename from cosv/inc/cosv/streamstr.hxx rename to include/cosv/streamstr.hxx diff --git a/cosv/inc/cosv/string.hxx b/include/cosv/string.hxx similarity index 100% rename from cosv/inc/cosv/string.hxx rename to include/cosv/string.hxx diff --git a/cosv/inc/cosv/stringdata.hxx b/include/cosv/stringdata.hxx similarity index 100% rename from cosv/inc/cosv/stringdata.hxx rename to include/cosv/stringdata.hxx diff --git a/cosv/inc/cosv/tpl/dyn.hxx b/include/cosv/tpl/dyn.hxx similarity index 100% rename from cosv/inc/cosv/tpl/dyn.hxx rename to include/cosv/tpl/dyn.hxx diff --git a/cosv/inc/cosv/tpl/processor.hxx b/include/cosv/tpl/processor.hxx similarity index 100% rename from cosv/inc/cosv/tpl/processor.hxx rename to include/cosv/tpl/processor.hxx diff --git a/cosv/inc/cosv/tpl/swelist.hxx b/include/cosv/tpl/swelist.hxx similarity index 100% rename from cosv/inc/cosv/tpl/swelist.hxx rename to include/cosv/tpl/swelist.hxx diff --git a/cosv/inc/cosv/tpl/tpltools.hxx b/include/cosv/tpl/tpltools.hxx similarity index 100% rename from cosv/inc/cosv/tpl/tpltools.hxx rename to include/cosv/tpl/tpltools.hxx diff --git a/cosv/inc/cosv/tpl/vvector.hxx b/include/cosv/tpl/vvector.hxx similarity index 100% rename from cosv/inc/cosv/tpl/vvector.hxx rename to include/cosv/tpl/vvector.hxx diff --git a/cosv/inc/cosv/x.hxx b/include/cosv/x.hxx similarity index 100% rename from cosv/inc/cosv/x.hxx rename to include/cosv/x.hxx diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/basegfxfactory.hxx rename to include/cppcanvas/basegfxfactory.hxx diff --git a/cppcanvas/inc/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/bitmap.hxx rename to include/cppcanvas/bitmap.hxx diff --git a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/bitmapcanvas.hxx rename to include/cppcanvas/bitmapcanvas.hxx diff --git a/cppcanvas/inc/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/canvas.hxx rename to include/cppcanvas/canvas.hxx diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/canvasgraphic.hxx rename to include/cppcanvas/canvasgraphic.hxx diff --git a/cppcanvas/inc/cppcanvas/color.hxx b/include/cppcanvas/color.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/color.hxx rename to include/cppcanvas/color.hxx diff --git a/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h b/include/cppcanvas/cppcanvasdllapi.h similarity index 100% rename from cppcanvas/inc/cppcanvas/cppcanvasdllapi.h rename to include/cppcanvas/cppcanvasdllapi.h diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/customsprite.hxx rename to include/cppcanvas/customsprite.hxx diff --git a/cppcanvas/inc/cppcanvas/font.hxx b/include/cppcanvas/font.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/font.hxx rename to include/cppcanvas/font.hxx diff --git a/cppcanvas/inc/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/polypolygon.hxx rename to include/cppcanvas/polypolygon.hxx diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/renderer.hxx rename to include/cppcanvas/renderer.hxx diff --git a/cppcanvas/inc/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/sprite.hxx rename to include/cppcanvas/sprite.hxx diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/spritecanvas.hxx rename to include/cppcanvas/spritecanvas.hxx diff --git a/cppcanvas/inc/cppcanvas/text.hxx b/include/cppcanvas/text.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/text.hxx rename to include/cppcanvas/text.hxx diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx similarity index 100% rename from cppcanvas/inc/cppcanvas/vclfactory.hxx rename to include/cppcanvas/vclfactory.hxx diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/include/drawinglayer/XShapeDumper.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/XShapeDumper.hxx rename to include/drawinglayer/XShapeDumper.hxx diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/animation/animationtiming.hxx rename to include/drawinglayer/animation/animationtiming.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx rename to include/drawinglayer/attribute/fillbitmapattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx rename to include/drawinglayer/attribute/fillgradientattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx rename to include/drawinglayer/attribute/fillhatchattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx rename to include/drawinglayer/attribute/fontattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx rename to include/drawinglayer/attribute/lineattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx rename to include/drawinglayer/attribute/linestartendattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx rename to include/drawinglayer/attribute/materialattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx rename to include/drawinglayer/attribute/sdrallattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx rename to include/drawinglayer/attribute/sdrfillattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/include/drawinglayer/attribute/sdrfillbitmapattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx rename to include/drawinglayer/attribute/sdrfillbitmapattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx rename to include/drawinglayer/attribute/sdrlightattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx rename to include/drawinglayer/attribute/sdrlightingattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx rename to include/drawinglayer/attribute/sdrlineattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx rename to include/drawinglayer/attribute/sdrlinestartendattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx rename to include/drawinglayer/attribute/sdrobjectattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx rename to include/drawinglayer/attribute/sdrsceneattribute3d.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx rename to include/drawinglayer/attribute/sdrshadowattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx rename to include/drawinglayer/attribute/strokeattribute.hxx diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/include/drawinglayer/drawinglayerdllapi.h similarity index 100% rename from drawinglayer/inc/drawinglayer/drawinglayerdllapi.h rename to include/drawinglayer/drawinglayerdllapi.h diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx rename to include/drawinglayer/geometry/viewinformation2d.hxx diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx rename to include/drawinglayer/geometry/viewinformation3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx rename to include/drawinglayer/primitive2d/animatedprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx rename to include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx rename to include/drawinglayer/primitive2d/baseprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx rename to include/drawinglayer/primitive2d/bitmapprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx rename to include/drawinglayer/primitive2d/borderlineprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx rename to include/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx rename to include/drawinglayer/primitive2d/controlprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx rename to include/drawinglayer/primitive2d/cropprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx rename to include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx rename to include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx rename to include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx rename to include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx rename to include/drawinglayer/primitive2d/epsprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx rename to include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx rename to include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx rename to include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx rename to include/drawinglayer/primitive2d/graphicprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx rename to include/drawinglayer/primitive2d/gridprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx rename to include/drawinglayer/primitive2d/groupprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx rename to include/drawinglayer/primitive2d/helplineprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx rename to include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx rename to include/drawinglayer/primitive2d/invertprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx rename to include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx rename to include/drawinglayer/primitive2d/maskprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx rename to include/drawinglayer/primitive2d/mediaprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx rename to include/drawinglayer/primitive2d/metafileprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx rename to include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx rename to include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx rename to include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx rename to include/drawinglayer/primitive2d/patternfillprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx rename to include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx rename to include/drawinglayer/primitive2d/polygonprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx rename to include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx rename to include/drawinglayer/primitive2d/primitivetools2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx rename to include/drawinglayer/primitive2d/sceneprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx rename to include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx rename to include/drawinglayer/primitive2d/shadowprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx rename to include/drawinglayer/primitive2d/structuretagprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx rename to include/drawinglayer/primitive2d/svggradientprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx rename to include/drawinglayer/primitive2d/textbreakuphelper.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx rename to include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx rename to include/drawinglayer/primitive2d/texteffectprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx rename to include/drawinglayer/primitive2d/textenumsprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx rename to include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx rename to include/drawinglayer/primitive2d/textlayoutdevice.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx rename to include/drawinglayer/primitive2d/textlineprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx rename to include/drawinglayer/primitive2d/textprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx rename to include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx rename to include/drawinglayer/primitive2d/transformprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx rename to include/drawinglayer/primitive2d/transparenceprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx rename to include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx rename to include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx rename to include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx rename to include/drawinglayer/primitive3d/baseprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx rename to include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx rename to include/drawinglayer/primitive3d/groupprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx rename to include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx rename to include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx rename to include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx rename to include/drawinglayer/primitive3d/polygonprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx rename to include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx rename to include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx rename to include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx rename to include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx rename to include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx rename to include/drawinglayer/primitive3d/shadowprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx rename to include/drawinglayer/primitive3d/textureprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx rename to include/drawinglayer/primitive3d/transformprimitive3d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx rename to include/drawinglayer/processor2d/baseprocessor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx rename to include/drawinglayer/processor2d/canvasprocessor.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx rename to include/drawinglayer/processor2d/contourextractor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/include/drawinglayer/processor2d/hittestprocessor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx rename to include/drawinglayer/processor2d/hittestprocessor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx rename to include/drawinglayer/processor2d/linegeometryextractor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/objectinfoextractor2d.hxx rename to include/drawinglayer/processor2d/objectinfoextractor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/processorfromoutputdevice.hxx rename to include/drawinglayer/processor2d/processorfromoutputdevice.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx rename to include/drawinglayer/processor2d/textaspolygonextractor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx rename to include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/include/drawinglayer/processor2d/vclpixelprocessor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx rename to include/drawinglayer/processor2d/vclpixelprocessor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/include/drawinglayer/processor2d/vclprocessor2d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx rename to include/drawinglayer/processor2d/vclprocessor2d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx rename to include/drawinglayer/processor3d/baseprocessor3d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx rename to include/drawinglayer/processor3d/cutfindprocessor3d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx rename to include/drawinglayer/processor3d/defaultprocessor3d.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx rename to include/drawinglayer/processor3d/geometry2dextractor.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx rename to include/drawinglayer/processor3d/shadow3dextractor.hxx diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx rename to include/drawinglayer/processor3d/zbufferprocessor3d.hxx diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/texture/texture.hxx rename to include/drawinglayer/texture/texture.hxx diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/include/drawinglayer/texture/texture3d.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/texture/texture3d.hxx rename to include/drawinglayer/texture/texture3d.hxx diff --git a/drawinglayer/inc/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx similarity index 100% rename from drawinglayer/inc/drawinglayer/tools/converters.hxx rename to include/drawinglayer/tools/converters.hxx diff --git a/editeng/inc/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleComponentBase.hxx rename to include/editeng/AccessibleComponentBase.hxx diff --git a/editeng/inc/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleContextBase.hxx rename to include/editeng/AccessibleContextBase.hxx diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleEditableTextPara.hxx rename to include/editeng/AccessibleEditableTextPara.hxx diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleImageBullet.hxx rename to include/editeng/AccessibleImageBullet.hxx diff --git a/editeng/inc/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleParaManager.hxx rename to include/editeng/AccessibleParaManager.hxx diff --git a/editeng/inc/editeng/AccessibleSelectionBase.hxx b/include/editeng/AccessibleSelectionBase.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleSelectionBase.hxx rename to include/editeng/AccessibleSelectionBase.hxx diff --git a/editeng/inc/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleStaticTextBase.hxx rename to include/editeng/AccessibleStaticTextBase.hxx diff --git a/editeng/inc/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx similarity index 100% rename from editeng/inc/editeng/AccessibleStringWrap.hxx rename to include/editeng/AccessibleStringWrap.hxx diff --git a/editeng/inc/editeng/LatinLookupTree.hxx b/include/editeng/LatinLookupTree.hxx similarity index 100% rename from editeng/inc/editeng/LatinLookupTree.hxx rename to include/editeng/LatinLookupTree.hxx diff --git a/editeng/inc/editeng/LatinTreeNode.hxx b/include/editeng/LatinTreeNode.hxx similarity index 100% rename from editeng/inc/editeng/LatinTreeNode.hxx rename to include/editeng/LatinTreeNode.hxx diff --git a/editeng/inc/editeng/LookupTree.hxx b/include/editeng/LookupTree.hxx similarity index 100% rename from editeng/inc/editeng/LookupTree.hxx rename to include/editeng/LookupTree.hxx diff --git a/editeng/inc/editeng/Node.hxx b/include/editeng/Node.hxx similarity index 100% rename from editeng/inc/editeng/Node.hxx rename to include/editeng/Node.hxx diff --git a/editeng/inc/editeng/SpellPortions.hxx b/include/editeng/SpellPortions.hxx similarity index 100% rename from editeng/inc/editeng/SpellPortions.hxx rename to include/editeng/SpellPortions.hxx diff --git a/editeng/inc/editeng/TreeHead.hxx b/include/editeng/TreeHead.hxx similarity index 100% rename from editeng/inc/editeng/TreeHead.hxx rename to include/editeng/TreeHead.hxx diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx similarity index 100% rename from editeng/inc/editeng/UnoForbiddenCharsTable.hxx rename to include/editeng/UnoForbiddenCharsTable.hxx diff --git a/editeng/inc/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx similarity index 100% rename from editeng/inc/editeng/acorrcfg.hxx rename to include/editeng/acorrcfg.hxx diff --git a/editeng/inc/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx similarity index 100% rename from editeng/inc/editeng/adjustitem.hxx rename to include/editeng/adjustitem.hxx diff --git a/editeng/inc/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx similarity index 100% rename from editeng/inc/editeng/autokernitem.hxx rename to include/editeng/autokernitem.hxx diff --git a/editeng/inc/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx similarity index 100% rename from editeng/inc/editeng/blinkitem.hxx rename to include/editeng/blinkitem.hxx diff --git a/editeng/inc/editeng/borderline.hxx b/include/editeng/borderline.hxx similarity index 100% rename from editeng/inc/editeng/borderline.hxx rename to include/editeng/borderline.hxx diff --git a/editeng/inc/editeng/boxitem.hxx b/include/editeng/boxitem.hxx similarity index 100% rename from editeng/inc/editeng/boxitem.hxx rename to include/editeng/boxitem.hxx diff --git a/editeng/inc/editeng/brushitem.hxx b/include/editeng/brushitem.hxx similarity index 100% rename from editeng/inc/editeng/brushitem.hxx rename to include/editeng/brushitem.hxx diff --git a/editeng/inc/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx similarity index 100% rename from editeng/inc/editeng/bulletitem.hxx rename to include/editeng/bulletitem.hxx diff --git a/editeng/inc/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx similarity index 100% rename from editeng/inc/editeng/charhiddenitem.hxx rename to include/editeng/charhiddenitem.hxx diff --git a/editeng/inc/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx similarity index 100% rename from editeng/inc/editeng/charreliefitem.hxx rename to include/editeng/charreliefitem.hxx diff --git a/editeng/inc/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx similarity index 100% rename from editeng/inc/editeng/charrotateitem.hxx rename to include/editeng/charrotateitem.hxx diff --git a/editeng/inc/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx similarity index 100% rename from editeng/inc/editeng/charscaleitem.hxx rename to include/editeng/charscaleitem.hxx diff --git a/editeng/inc/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx similarity index 100% rename from editeng/inc/editeng/charsetcoloritem.hxx rename to include/editeng/charsetcoloritem.hxx diff --git a/editeng/inc/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx similarity index 100% rename from editeng/inc/editeng/cmapitem.hxx rename to include/editeng/cmapitem.hxx diff --git a/editeng/inc/editeng/colritem.hxx b/include/editeng/colritem.hxx similarity index 100% rename from editeng/inc/editeng/colritem.hxx rename to include/editeng/colritem.hxx diff --git a/editeng/inc/editeng/contouritem.hxx b/include/editeng/contouritem.hxx similarity index 100% rename from editeng/inc/editeng/contouritem.hxx rename to include/editeng/contouritem.hxx diff --git a/editeng/inc/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx similarity index 100% rename from editeng/inc/editeng/crossedoutitem.hxx rename to include/editeng/crossedoutitem.hxx diff --git a/editeng/inc/editeng/editdata.hxx b/include/editeng/editdata.hxx similarity index 100% rename from editeng/inc/editeng/editdata.hxx rename to include/editeng/editdata.hxx diff --git a/editeng/inc/editeng/editeng.hxx b/include/editeng/editeng.hxx similarity index 100% rename from editeng/inc/editeng/editeng.hxx rename to include/editeng/editeng.hxx diff --git a/editeng/inc/editeng/editengdllapi.h b/include/editeng/editengdllapi.h similarity index 100% rename from editeng/inc/editeng/editengdllapi.h rename to include/editeng/editengdllapi.h diff --git a/editeng/inc/editeng/editerr.hxx b/include/editeng/editerr.hxx similarity index 100% rename from editeng/inc/editeng/editerr.hxx rename to include/editeng/editerr.hxx diff --git a/editeng/inc/editeng/editids.hrc b/include/editeng/editids.hrc similarity index 100% rename from editeng/inc/editeng/editids.hrc rename to include/editeng/editids.hrc diff --git a/editeng/inc/editeng/editobj.hxx b/include/editeng/editobj.hxx similarity index 100% rename from editeng/inc/editeng/editobj.hxx rename to include/editeng/editobj.hxx diff --git a/editeng/inc/editeng/editrids.hrc b/include/editeng/editrids.hrc similarity index 100% rename from editeng/inc/editeng/editrids.hrc rename to include/editeng/editrids.hrc diff --git a/editeng/inc/editeng/editstat.hxx b/include/editeng/editstat.hxx similarity index 100% rename from editeng/inc/editeng/editstat.hxx rename to include/editeng/editstat.hxx diff --git a/editeng/inc/editeng/editund2.hxx b/include/editeng/editund2.hxx similarity index 100% rename from editeng/inc/editeng/editund2.hxx rename to include/editeng/editund2.hxx diff --git a/editeng/inc/editeng/editview.hxx b/include/editeng/editview.hxx similarity index 100% rename from editeng/inc/editeng/editview.hxx rename to include/editeng/editview.hxx diff --git a/editeng/inc/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx similarity index 100% rename from editeng/inc/editeng/edtdlg.hxx rename to include/editeng/edtdlg.hxx diff --git a/editeng/inc/editeng/eedata.hxx b/include/editeng/eedata.hxx similarity index 100% rename from editeng/inc/editeng/eedata.hxx rename to include/editeng/eedata.hxx diff --git a/editeng/inc/editeng/eeitem.hxx b/include/editeng/eeitem.hxx similarity index 100% rename from editeng/inc/editeng/eeitem.hxx rename to include/editeng/eeitem.hxx diff --git a/editeng/inc/editeng/eeitemid.hxx b/include/editeng/eeitemid.hxx similarity index 100% rename from editeng/inc/editeng/eeitemid.hxx rename to include/editeng/eeitemid.hxx diff --git a/editeng/inc/editeng/eerdll.hxx b/include/editeng/eerdll.hxx similarity index 100% rename from editeng/inc/editeng/eerdll.hxx rename to include/editeng/eerdll.hxx diff --git a/editeng/inc/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx similarity index 100% rename from editeng/inc/editeng/emphasismarkitem.hxx rename to include/editeng/emphasismarkitem.hxx diff --git a/editeng/inc/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx similarity index 100% rename from editeng/inc/editeng/escapementitem.hxx rename to include/editeng/escapementitem.hxx diff --git a/editeng/inc/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx similarity index 100% rename from editeng/inc/editeng/fhgtitem.hxx rename to include/editeng/fhgtitem.hxx diff --git a/editeng/inc/editeng/fieldupdater.hxx b/include/editeng/fieldupdater.hxx similarity index 100% rename from editeng/inc/editeng/fieldupdater.hxx rename to include/editeng/fieldupdater.hxx diff --git a/editeng/inc/editeng/flditem.hxx b/include/editeng/flditem.hxx similarity index 100% rename from editeng/inc/editeng/flditem.hxx rename to include/editeng/flditem.hxx diff --git a/editeng/inc/editeng/flstitem.hxx b/include/editeng/flstitem.hxx similarity index 100% rename from editeng/inc/editeng/flstitem.hxx rename to include/editeng/flstitem.hxx diff --git a/editeng/inc/editeng/fontitem.hxx b/include/editeng/fontitem.hxx similarity index 100% rename from editeng/inc/editeng/fontitem.hxx rename to include/editeng/fontitem.hxx diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx similarity index 100% rename from editeng/inc/editeng/forbiddencharacterstable.hxx rename to include/editeng/forbiddencharacterstable.hxx diff --git a/editeng/inc/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx similarity index 100% rename from editeng/inc/editeng/forbiddenruleitem.hxx rename to include/editeng/forbiddenruleitem.hxx diff --git a/editeng/inc/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx similarity index 100% rename from editeng/inc/editeng/formatbreakitem.hxx rename to include/editeng/formatbreakitem.hxx diff --git a/editeng/inc/editeng/frmdir.hxx b/include/editeng/frmdir.hxx similarity index 100% rename from editeng/inc/editeng/frmdir.hxx rename to include/editeng/frmdir.hxx diff --git a/editeng/inc/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx similarity index 100% rename from editeng/inc/editeng/frmdiritem.hxx rename to include/editeng/frmdiritem.hxx diff --git a/editeng/inc/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx similarity index 100% rename from editeng/inc/editeng/fwdtitem.hxx rename to include/editeng/fwdtitem.hxx diff --git a/editeng/inc/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx similarity index 100% rename from editeng/inc/editeng/hangulhanja.hxx rename to include/editeng/hangulhanja.hxx diff --git a/editeng/inc/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx similarity index 100% rename from editeng/inc/editeng/hngpnctitem.hxx rename to include/editeng/hngpnctitem.hxx diff --git a/editeng/inc/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx similarity index 100% rename from editeng/inc/editeng/hyphenzoneitem.hxx rename to include/editeng/hyphenzoneitem.hxx diff --git a/editeng/inc/editeng/itemtype.hxx b/include/editeng/itemtype.hxx similarity index 100% rename from editeng/inc/editeng/itemtype.hxx rename to include/editeng/itemtype.hxx diff --git a/editeng/inc/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx similarity index 100% rename from editeng/inc/editeng/justifyitem.hxx rename to include/editeng/justifyitem.hxx diff --git a/editeng/inc/editeng/keepitem.hxx b/include/editeng/keepitem.hxx similarity index 100% rename from editeng/inc/editeng/keepitem.hxx rename to include/editeng/keepitem.hxx diff --git a/editeng/inc/editeng/kernitem.hxx b/include/editeng/kernitem.hxx similarity index 100% rename from editeng/inc/editeng/kernitem.hxx rename to include/editeng/kernitem.hxx diff --git a/editeng/inc/editeng/langitem.hxx b/include/editeng/langitem.hxx similarity index 100% rename from editeng/inc/editeng/langitem.hxx rename to include/editeng/langitem.hxx diff --git a/editeng/inc/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx similarity index 100% rename from editeng/inc/editeng/lcolitem.hxx rename to include/editeng/lcolitem.hxx diff --git a/editeng/inc/editeng/lineitem.hxx b/include/editeng/lineitem.hxx similarity index 100% rename from editeng/inc/editeng/lineitem.hxx rename to include/editeng/lineitem.hxx diff --git a/editeng/inc/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx similarity index 100% rename from editeng/inc/editeng/lrspitem.hxx rename to include/editeng/lrspitem.hxx diff --git a/editeng/inc/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx similarity index 100% rename from editeng/inc/editeng/lspcitem.hxx rename to include/editeng/lspcitem.hxx diff --git a/editeng/inc/editeng/macros.hxx b/include/editeng/macros.hxx similarity index 100% rename from editeng/inc/editeng/macros.hxx rename to include/editeng/macros.hxx diff --git a/editeng/inc/editeng/measfld.hxx b/include/editeng/measfld.hxx similarity index 100% rename from editeng/inc/editeng/measfld.hxx rename to include/editeng/measfld.hxx diff --git a/editeng/inc/editeng/memberids.hrc b/include/editeng/memberids.hrc similarity index 100% rename from editeng/inc/editeng/memberids.hrc rename to include/editeng/memberids.hrc diff --git a/editeng/inc/editeng/mutxhelp.hxx b/include/editeng/mutxhelp.hxx similarity index 100% rename from editeng/inc/editeng/mutxhelp.hxx rename to include/editeng/mutxhelp.hxx diff --git a/editeng/inc/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx similarity index 100% rename from editeng/inc/editeng/nhypitem.hxx rename to include/editeng/nhypitem.hxx diff --git a/editeng/inc/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx similarity index 100% rename from editeng/inc/editeng/nlbkitem.hxx rename to include/editeng/nlbkitem.hxx diff --git a/editeng/inc/editeng/numdef.hxx b/include/editeng/numdef.hxx similarity index 100% rename from editeng/inc/editeng/numdef.hxx rename to include/editeng/numdef.hxx diff --git a/editeng/inc/editeng/numitem.hxx b/include/editeng/numitem.hxx similarity index 100% rename from editeng/inc/editeng/numitem.hxx rename to include/editeng/numitem.hxx diff --git a/editeng/inc/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx similarity index 100% rename from editeng/inc/editeng/opaqitem.hxx rename to include/editeng/opaqitem.hxx diff --git a/editeng/inc/editeng/optitems.hxx b/include/editeng/optitems.hxx similarity index 100% rename from editeng/inc/editeng/optitems.hxx rename to include/editeng/optitems.hxx diff --git a/editeng/inc/editeng/orphitem.hxx b/include/editeng/orphitem.hxx similarity index 100% rename from editeng/inc/editeng/orphitem.hxx rename to include/editeng/orphitem.hxx diff --git a/editeng/inc/editeng/outliner.hxx b/include/editeng/outliner.hxx similarity index 100% rename from editeng/inc/editeng/outliner.hxx rename to include/editeng/outliner.hxx diff --git a/editeng/inc/editeng/outlobj.hxx b/include/editeng/outlobj.hxx similarity index 100% rename from editeng/inc/editeng/outlobj.hxx rename to include/editeng/outlobj.hxx diff --git a/editeng/inc/editeng/paperinf.hxx b/include/editeng/paperinf.hxx similarity index 100% rename from editeng/inc/editeng/paperinf.hxx rename to include/editeng/paperinf.hxx diff --git a/editeng/inc/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx similarity index 100% rename from editeng/inc/editeng/paragraphdata.hxx rename to include/editeng/paragraphdata.hxx diff --git a/editeng/inc/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx similarity index 100% rename from editeng/inc/editeng/paravertalignitem.hxx rename to include/editeng/paravertalignitem.hxx diff --git a/editeng/inc/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx similarity index 100% rename from editeng/inc/editeng/pbinitem.hxx rename to include/editeng/pbinitem.hxx diff --git a/editeng/inc/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx similarity index 100% rename from editeng/inc/editeng/pgrditem.hxx rename to include/editeng/pgrditem.hxx diff --git a/editeng/inc/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx similarity index 100% rename from editeng/inc/editeng/pmdlitem.hxx rename to include/editeng/pmdlitem.hxx diff --git a/editeng/inc/editeng/postitem.hxx b/include/editeng/postitem.hxx similarity index 100% rename from editeng/inc/editeng/postitem.hxx rename to include/editeng/postitem.hxx diff --git a/editeng/inc/editeng/prntitem.hxx b/include/editeng/prntitem.hxx similarity index 100% rename from editeng/inc/editeng/prntitem.hxx rename to include/editeng/prntitem.hxx diff --git a/editeng/inc/editeng/protitem.hxx b/include/editeng/protitem.hxx similarity index 100% rename from editeng/inc/editeng/protitem.hxx rename to include/editeng/protitem.hxx diff --git a/editeng/inc/editeng/prszitem.hxx b/include/editeng/prszitem.hxx similarity index 100% rename from editeng/inc/editeng/prszitem.hxx rename to include/editeng/prszitem.hxx diff --git a/editeng/inc/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx similarity index 100% rename from editeng/inc/editeng/rsiditem.hxx rename to include/editeng/rsiditem.hxx diff --git a/editeng/inc/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx similarity index 100% rename from editeng/inc/editeng/scriptspaceitem.hxx rename to include/editeng/scriptspaceitem.hxx diff --git a/editeng/inc/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx similarity index 100% rename from editeng/inc/editeng/scripttypeitem.hxx rename to include/editeng/scripttypeitem.hxx diff --git a/editeng/inc/editeng/shaditem.hxx b/include/editeng/shaditem.hxx similarity index 100% rename from editeng/inc/editeng/shaditem.hxx rename to include/editeng/shaditem.hxx diff --git a/editeng/inc/editeng/shdditem.hxx b/include/editeng/shdditem.hxx similarity index 100% rename from editeng/inc/editeng/shdditem.hxx rename to include/editeng/shdditem.hxx diff --git a/editeng/inc/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx similarity index 100% rename from editeng/inc/editeng/sizeitem.hxx rename to include/editeng/sizeitem.hxx diff --git a/editeng/inc/editeng/spltitem.hxx b/include/editeng/spltitem.hxx similarity index 100% rename from editeng/inc/editeng/spltitem.hxx rename to include/editeng/spltitem.hxx diff --git a/editeng/inc/editeng/splwrap.hxx b/include/editeng/splwrap.hxx similarity index 100% rename from editeng/inc/editeng/splwrap.hxx rename to include/editeng/splwrap.hxx diff --git a/editeng/inc/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx similarity index 100% rename from editeng/inc/editeng/svxacorr.hxx rename to include/editeng/svxacorr.hxx diff --git a/editeng/inc/editeng/svxenum.hxx b/include/editeng/svxenum.hxx similarity index 100% rename from editeng/inc/editeng/svxenum.hxx rename to include/editeng/svxenum.hxx diff --git a/editeng/inc/editeng/svxfont.hxx b/include/editeng/svxfont.hxx similarity index 100% rename from editeng/inc/editeng/svxfont.hxx rename to include/editeng/svxfont.hxx diff --git a/editeng/inc/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx similarity index 100% rename from editeng/inc/editeng/svxrtf.hxx rename to include/editeng/svxrtf.hxx diff --git a/editeng/inc/editeng/swafopt.hxx b/include/editeng/swafopt.hxx similarity index 100% rename from editeng/inc/editeng/swafopt.hxx rename to include/editeng/swafopt.hxx diff --git a/editeng/inc/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx similarity index 100% rename from editeng/inc/editeng/tstpitem.hxx rename to include/editeng/tstpitem.hxx diff --git a/editeng/inc/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx similarity index 100% rename from editeng/inc/editeng/twolinesitem.hxx rename to include/editeng/twolinesitem.hxx diff --git a/editeng/inc/editeng/txtrange.hxx b/include/editeng/txtrange.hxx similarity index 100% rename from editeng/inc/editeng/txtrange.hxx rename to include/editeng/txtrange.hxx diff --git a/editeng/inc/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx similarity index 100% rename from editeng/inc/editeng/udlnitem.hxx rename to include/editeng/udlnitem.hxx diff --git a/editeng/inc/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx similarity index 100% rename from editeng/inc/editeng/ulspitem.hxx rename to include/editeng/ulspitem.hxx diff --git a/editeng/inc/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx similarity index 100% rename from editeng/inc/editeng/unoedhlp.hxx rename to include/editeng/unoedhlp.hxx diff --git a/editeng/inc/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx similarity index 100% rename from editeng/inc/editeng/unoedprx.hxx rename to include/editeng/unoedprx.hxx diff --git a/editeng/inc/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx similarity index 100% rename from editeng/inc/editeng/unoedsrc.hxx rename to include/editeng/unoedsrc.hxx diff --git a/editeng/inc/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx similarity index 100% rename from editeng/inc/editeng/unofdesc.hxx rename to include/editeng/unofdesc.hxx diff --git a/editeng/inc/editeng/unofield.hxx b/include/editeng/unofield.hxx similarity index 100% rename from editeng/inc/editeng/unofield.hxx rename to include/editeng/unofield.hxx diff --git a/editeng/inc/editeng/unofored.hxx b/include/editeng/unofored.hxx similarity index 100% rename from editeng/inc/editeng/unofored.hxx rename to include/editeng/unofored.hxx diff --git a/editeng/inc/editeng/unoforou.hxx b/include/editeng/unoforou.hxx similarity index 100% rename from editeng/inc/editeng/unoforou.hxx rename to include/editeng/unoforou.hxx diff --git a/editeng/inc/editeng/unoipset.hxx b/include/editeng/unoipset.hxx similarity index 100% rename from editeng/inc/editeng/unoipset.hxx rename to include/editeng/unoipset.hxx diff --git a/editeng/inc/editeng/unolingu.hxx b/include/editeng/unolingu.hxx similarity index 100% rename from editeng/inc/editeng/unolingu.hxx rename to include/editeng/unolingu.hxx diff --git a/editeng/inc/editeng/unonames.hxx b/include/editeng/unonames.hxx similarity index 100% rename from editeng/inc/editeng/unonames.hxx rename to include/editeng/unonames.hxx diff --git a/editeng/inc/editeng/unonrule.hxx b/include/editeng/unonrule.hxx similarity index 100% rename from editeng/inc/editeng/unonrule.hxx rename to include/editeng/unonrule.hxx diff --git a/editeng/inc/editeng/unopracc.hxx b/include/editeng/unopracc.hxx similarity index 100% rename from editeng/inc/editeng/unopracc.hxx rename to include/editeng/unopracc.hxx diff --git a/editeng/inc/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx similarity index 100% rename from editeng/inc/editeng/unoprnms.hxx rename to include/editeng/unoprnms.hxx diff --git a/editeng/inc/editeng/unotext.hxx b/include/editeng/unotext.hxx similarity index 100% rename from editeng/inc/editeng/unotext.hxx rename to include/editeng/unotext.hxx diff --git a/editeng/inc/editeng/unoviwou.hxx b/include/editeng/unoviwou.hxx similarity index 100% rename from editeng/inc/editeng/unoviwou.hxx rename to include/editeng/unoviwou.hxx diff --git a/editeng/inc/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx similarity index 100% rename from editeng/inc/editeng/wghtitem.hxx rename to include/editeng/wghtitem.hxx diff --git a/editeng/inc/editeng/widwitem.hxx b/include/editeng/widwitem.hxx similarity index 100% rename from editeng/inc/editeng/widwitem.hxx rename to include/editeng/widwitem.hxx diff --git a/editeng/inc/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx similarity index 100% rename from editeng/inc/editeng/writingmodeitem.hxx rename to include/editeng/writingmodeitem.hxx diff --git a/editeng/inc/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx similarity index 100% rename from editeng/inc/editeng/wrlmitem.hxx rename to include/editeng/wrlmitem.hxx diff --git a/editeng/inc/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx similarity index 100% rename from editeng/inc/editeng/xmlcnitm.hxx rename to include/editeng/xmlcnitm.hxx diff --git a/filter/inc/filter/dllapi.h b/include/filter/dllapi.h similarity index 100% rename from filter/inc/filter/dllapi.h rename to include/filter/dllapi.h diff --git a/filter/inc/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx similarity index 100% rename from filter/inc/filter/msfilter/countryid.hxx rename to include/filter/msfilter/countryid.hxx diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx similarity index 100% rename from filter/inc/filter/msfilter/dffpropset.hxx rename to include/filter/msfilter/dffpropset.hxx diff --git a/filter/inc/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx similarity index 100% rename from filter/inc/filter/msfilter/dffrecordheader.hxx rename to include/filter/msfilter/dffrecordheader.hxx diff --git a/filter/inc/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx similarity index 100% rename from filter/inc/filter/msfilter/escherex.hxx rename to include/filter/msfilter/escherex.hxx diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx similarity index 100% rename from filter/inc/filter/msfilter/mscodec.hxx rename to include/filter/msfilter/mscodec.hxx diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx similarity index 100% rename from filter/inc/filter/msfilter/msdffimp.hxx rename to include/filter/msfilter/msdffimp.hxx diff --git a/filter/inc/filter/msfilter/msfilterdllapi.h b/include/filter/msfilter/msfilterdllapi.h similarity index 100% rename from filter/inc/filter/msfilter/msfilterdllapi.h rename to include/filter/msfilter/msfilterdllapi.h diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx similarity index 100% rename from filter/inc/filter/msfilter/msocximex.hxx rename to include/filter/msfilter/msocximex.hxx diff --git a/filter/inc/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx similarity index 100% rename from filter/inc/filter/msfilter/msoleexp.hxx rename to include/filter/msfilter/msoleexp.hxx diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx similarity index 100% rename from filter/inc/filter/msfilter/mstoolbar.hxx rename to include/filter/msfilter/mstoolbar.hxx diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx similarity index 100% rename from filter/inc/filter/msfilter/msvbahelper.hxx rename to include/filter/msfilter/msvbahelper.hxx diff --git a/filter/inc/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx similarity index 100% rename from filter/inc/filter/msfilter/rtfutil.hxx rename to include/filter/msfilter/rtfutil.hxx diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx similarity index 100% rename from filter/inc/filter/msfilter/svdfppt.hxx rename to include/filter/msfilter/svdfppt.hxx diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx similarity index 100% rename from filter/inc/filter/msfilter/svxmsbas.hxx rename to include/filter/msfilter/svxmsbas.hxx diff --git a/filter/inc/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx similarity index 100% rename from filter/inc/filter/msfilter/util.hxx rename to include/filter/msfilter/util.hxx diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx similarity index 100% rename from formula/inc/formula/ExternalReferenceHelper.hxx rename to include/formula/ExternalReferenceHelper.hxx diff --git a/formula/inc/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx similarity index 100% rename from formula/inc/formula/FormulaCompiler.hxx rename to include/formula/FormulaCompiler.hxx diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx similarity index 100% rename from formula/inc/formula/FormulaOpCodeMapperObj.hxx rename to include/formula/FormulaOpCodeMapperObj.hxx diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx similarity index 100% rename from formula/inc/formula/IControlReferenceHandler.hxx rename to include/formula/IControlReferenceHandler.hxx diff --git a/formula/inc/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx similarity index 100% rename from formula/inc/formula/IFunctionDescription.hxx rename to include/formula/IFunctionDescription.hxx diff --git a/formula/inc/formula/compiler.hrc b/include/formula/compiler.hrc similarity index 100% rename from formula/inc/formula/compiler.hrc rename to include/formula/compiler.hrc diff --git a/formula/inc/formula/errorcodes.hxx b/include/formula/errorcodes.hxx similarity index 100% rename from formula/inc/formula/errorcodes.hxx rename to include/formula/errorcodes.hxx diff --git a/formula/inc/formula/formdata.hxx b/include/formula/formdata.hxx similarity index 100% rename from formula/inc/formula/formdata.hxx rename to include/formula/formdata.hxx diff --git a/formula/inc/formula/formula.hxx b/include/formula/formula.hxx similarity index 100% rename from formula/inc/formula/formula.hxx rename to include/formula/formula.hxx diff --git a/formula/inc/formula/formuladllapi.h b/include/formula/formuladllapi.h similarity index 100% rename from formula/inc/formula/formuladllapi.h rename to include/formula/formuladllapi.h diff --git a/formula/inc/formula/formulahelper.hxx b/include/formula/formulahelper.hxx similarity index 100% rename from formula/inc/formula/formulahelper.hxx rename to include/formula/formulahelper.hxx diff --git a/formula/inc/formula/funcutl.hxx b/include/formula/funcutl.hxx similarity index 100% rename from formula/inc/formula/funcutl.hxx rename to include/formula/funcutl.hxx diff --git a/formula/inc/formula/grammar.hxx b/include/formula/grammar.hxx similarity index 100% rename from formula/inc/formula/grammar.hxx rename to include/formula/grammar.hxx diff --git a/formula/inc/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx similarity index 100% rename from formula/inc/formula/omoduleclient.hxx rename to include/formula/omoduleclient.hxx diff --git a/formula/inc/formula/opcode.hxx b/include/formula/opcode.hxx similarity index 100% rename from formula/inc/formula/opcode.hxx rename to include/formula/opcode.hxx diff --git a/formula/inc/formula/token.hxx b/include/formula/token.hxx similarity index 100% rename from formula/inc/formula/token.hxx rename to include/formula/token.hxx diff --git a/formula/inc/formula/tokenarray.hxx b/include/formula/tokenarray.hxx similarity index 100% rename from formula/inc/formula/tokenarray.hxx rename to include/formula/tokenarray.hxx diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx similarity index 100% rename from framework/inc/framework/actiontriggerhelper.hxx rename to include/framework/actiontriggerhelper.hxx diff --git a/framework/inc/framework/addonmenu.hxx b/include/framework/addonmenu.hxx similarity index 100% rename from framework/inc/framework/addonmenu.hxx rename to include/framework/addonmenu.hxx diff --git a/framework/inc/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx similarity index 100% rename from framework/inc/framework/addonsoptions.hxx rename to include/framework/addonsoptions.hxx diff --git a/framework/inc/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx similarity index 100% rename from framework/inc/framework/bmkmenu.hxx rename to include/framework/bmkmenu.hxx diff --git a/framework/inc/framework/configimporter.hxx b/include/framework/configimporter.hxx similarity index 100% rename from framework/inc/framework/configimporter.hxx rename to include/framework/configimporter.hxx diff --git a/framework/inc/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx similarity index 100% rename from framework/inc/framework/documentundoguard.hxx rename to include/framework/documentundoguard.hxx diff --git a/framework/inc/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx similarity index 100% rename from framework/inc/framework/eventsconfiguration.hxx rename to include/framework/eventsconfiguration.hxx diff --git a/framework/inc/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx similarity index 100% rename from framework/inc/framework/framelistanalyzer.hxx rename to include/framework/framelistanalyzer.hxx diff --git a/framework/inc/framework/fwedllapi.h b/include/framework/fwedllapi.h similarity index 100% rename from framework/inc/framework/fwedllapi.h rename to include/framework/fwedllapi.h diff --git a/framework/inc/framework/iguard.hxx b/include/framework/iguard.hxx similarity index 100% rename from framework/inc/framework/iguard.hxx rename to include/framework/iguard.hxx diff --git a/framework/inc/framework/imageproducer.hxx b/include/framework/imageproducer.hxx similarity index 100% rename from framework/inc/framework/imageproducer.hxx rename to include/framework/imageproducer.hxx diff --git a/framework/inc/framework/imutex.hxx b/include/framework/imutex.hxx similarity index 100% rename from framework/inc/framework/imutex.hxx rename to include/framework/imutex.hxx diff --git a/framework/inc/framework/interaction.hxx b/include/framework/interaction.hxx similarity index 100% rename from framework/inc/framework/interaction.hxx rename to include/framework/interaction.hxx diff --git a/framework/inc/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx similarity index 100% rename from framework/inc/framework/menuconfiguration.hxx rename to include/framework/menuconfiguration.hxx diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/include/framework/menuextensionsupplier.hxx similarity index 100% rename from framework/inc/framework/menuextensionsupplier.hxx rename to include/framework/menuextensionsupplier.hxx diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx similarity index 100% rename from framework/inc/framework/preventduplicateinteraction.hxx rename to include/framework/preventduplicateinteraction.hxx diff --git a/framework/inc/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx similarity index 100% rename from framework/inc/framework/sfxhelperfunctions.hxx rename to include/framework/sfxhelperfunctions.hxx diff --git a/framework/inc/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx similarity index 100% rename from framework/inc/framework/statusbarconfiguration.hxx rename to include/framework/statusbarconfiguration.hxx diff --git a/framework/inc/framework/titlehelper.hxx b/include/framework/titlehelper.hxx similarity index 100% rename from framework/inc/framework/titlehelper.hxx rename to include/framework/titlehelper.hxx diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx similarity index 100% rename from framework/inc/framework/toolboxconfiguration.hxx rename to include/framework/toolboxconfiguration.hxx diff --git a/framework/inc/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx similarity index 100% rename from framework/inc/framework/undomanagerhelper.hxx rename to include/framework/undomanagerhelper.hxx diff --git a/i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h b/include/i18nlangtag/i18nlangtagdllapi.h similarity index 100% rename from i18nlangtag/inc/i18nlangtag/i18nlangtagdllapi.h rename to include/i18nlangtag/i18nlangtagdllapi.h diff --git a/i18nlangtag/inc/i18nlangtag/lang.h b/include/i18nlangtag/lang.h similarity index 100% rename from i18nlangtag/inc/i18nlangtag/lang.h rename to include/i18nlangtag/lang.h diff --git a/i18nlangtag/inc/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx similarity index 100% rename from i18nlangtag/inc/i18nlangtag/languagetag.hxx rename to include/i18nlangtag/languagetag.hxx diff --git a/i18nlangtag/inc/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx similarity index 100% rename from i18nlangtag/inc/i18nlangtag/mslangid.hxx rename to include/i18nlangtag/mslangid.hxx diff --git a/i18nutil/inc/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx similarity index 100% rename from i18nutil/inc/i18nutil/casefolding.hxx rename to include/i18nutil/casefolding.hxx diff --git a/i18nutil/inc/i18nutil/i18nutildllapi.h b/include/i18nutil/i18nutildllapi.h similarity index 100% rename from i18nutil/inc/i18nutil/i18nutildllapi.h rename to include/i18nutil/i18nutildllapi.h diff --git a/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx similarity index 100% rename from i18nutil/inc/i18nutil/oneToOneMapping.hxx rename to include/i18nutil/oneToOneMapping.hxx diff --git a/i18nutil/inc/i18nutil/paper.hxx b/include/i18nutil/paper.hxx similarity index 100% rename from i18nutil/inc/i18nutil/paper.hxx rename to include/i18nutil/paper.hxx diff --git a/i18nutil/inc/i18nutil/scripttypedetector.hxx b/include/i18nutil/scripttypedetector.hxx similarity index 100% rename from i18nutil/inc/i18nutil/scripttypedetector.hxx rename to include/i18nutil/scripttypedetector.hxx diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx similarity index 100% rename from i18nutil/inc/i18nutil/unicode.hxx rename to include/i18nutil/unicode.hxx diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx similarity index 100% rename from i18nutil/inc/i18nutil/widthfolding.hxx rename to include/i18nutil/widthfolding.hxx diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx similarity index 100% rename from jvmaccess/inc/jvmaccess/classpath.hxx rename to include/jvmaccess/classpath.hxx diff --git a/jvmaccess/inc/jvmaccess/jvmaccessdllapi.h b/include/jvmaccess/jvmaccessdllapi.h similarity index 100% rename from jvmaccess/inc/jvmaccess/jvmaccessdllapi.h rename to include/jvmaccess/jvmaccessdllapi.h diff --git a/jvmaccess/inc/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx similarity index 100% rename from jvmaccess/inc/jvmaccess/unovirtualmachine.hxx rename to include/jvmaccess/unovirtualmachine.hxx diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/include/jvmaccess/virtualmachine.hxx similarity index 100% rename from jvmaccess/inc/jvmaccess/virtualmachine.hxx rename to include/jvmaccess/virtualmachine.hxx diff --git a/jvmfwk/inc/jvmfwk/framework.h b/include/jvmfwk/framework.h similarity index 100% rename from jvmfwk/inc/jvmfwk/framework.h rename to include/jvmfwk/framework.h diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/include/jvmfwk/jvmfwkdllapi.h similarity index 100% rename from jvmfwk/inc/jvmfwk/jvmfwkdllapi.h rename to include/jvmfwk/jvmfwkdllapi.h diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/include/jvmfwk/jvmfwkplugindllapi.h similarity index 100% rename from jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h rename to include/jvmfwk/jvmfwkplugindllapi.h diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/include/jvmfwk/vendorplugin.h similarity index 100% rename from jvmfwk/inc/jvmfwk/vendorplugin.h rename to include/jvmfwk/vendorplugin.h diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx similarity index 100% rename from linguistic/inc/linguistic/hyphdta.hxx rename to include/linguistic/hyphdta.hxx diff --git a/linguistic/inc/linguistic/lngdllapi.h b/include/linguistic/lngdllapi.h similarity index 100% rename from linguistic/inc/linguistic/lngdllapi.h rename to include/linguistic/lngdllapi.h diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx similarity index 100% rename from linguistic/inc/linguistic/lngprophelp.hxx rename to include/linguistic/lngprophelp.hxx diff --git a/linguistic/inc/linguistic/lngprops.hxx b/include/linguistic/lngprops.hxx similarity index 100% rename from linguistic/inc/linguistic/lngprops.hxx rename to include/linguistic/lngprops.hxx diff --git a/linguistic/inc/linguistic/misc.hxx b/include/linguistic/misc.hxx similarity index 100% rename from linguistic/inc/linguistic/misc.hxx rename to include/linguistic/misc.hxx diff --git a/linguistic/inc/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx similarity index 100% rename from linguistic/inc/linguistic/spelldta.hxx rename to include/linguistic/spelldta.hxx diff --git a/o3tl/inc/o3tl/compat_functional.hxx b/include/o3tl/compat_functional.hxx similarity index 100% rename from o3tl/inc/o3tl/compat_functional.hxx rename to include/o3tl/compat_functional.hxx diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx similarity index 100% rename from o3tl/inc/o3tl/cow_wrapper.hxx rename to include/o3tl/cow_wrapper.hxx diff --git a/o3tl/inc/o3tl/heap_ptr.hxx b/include/o3tl/heap_ptr.hxx similarity index 100% rename from o3tl/inc/o3tl/heap_ptr.hxx rename to include/o3tl/heap_ptr.hxx diff --git a/o3tl/inc/o3tl/lazy_update.hxx b/include/o3tl/lazy_update.hxx similarity index 100% rename from o3tl/inc/o3tl/lazy_update.hxx rename to include/o3tl/lazy_update.hxx diff --git a/o3tl/inc/o3tl/range.hxx b/include/o3tl/range.hxx similarity index 100% rename from o3tl/inc/o3tl/range.hxx rename to include/o3tl/range.hxx diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx similarity index 100% rename from o3tl/inc/o3tl/sorted_vector.hxx rename to include/o3tl/sorted_vector.hxx diff --git a/o3tl/inc/o3tl/vector_pool.hxx b/include/o3tl/vector_pool.hxx similarity index 100% rename from o3tl/inc/o3tl/vector_pool.hxx rename to include/o3tl/vector_pool.hxx diff --git a/oox/inc/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx similarity index 100% rename from oox/inc/oox/core/binarycodec.hxx rename to include/oox/core/binarycodec.hxx diff --git a/oox/inc/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx similarity index 100% rename from oox/inc/oox/core/contexthandler.hxx rename to include/oox/core/contexthandler.hxx diff --git a/oox/inc/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx similarity index 100% rename from oox/inc/oox/core/contexthandler2.hxx rename to include/oox/core/contexthandler2.hxx diff --git a/oox/inc/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx similarity index 100% rename from oox/inc/oox/core/fastparser.hxx rename to include/oox/core/fastparser.hxx diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx similarity index 100% rename from oox/inc/oox/core/fasttokenhandler.hxx rename to include/oox/core/fasttokenhandler.hxx diff --git a/oox/inc/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx similarity index 100% rename from oox/inc/oox/core/filterbase.hxx rename to include/oox/core/filterbase.hxx diff --git a/oox/inc/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx similarity index 100% rename from oox/inc/oox/core/filterdetect.hxx rename to include/oox/core/filterdetect.hxx diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx similarity index 100% rename from oox/inc/oox/core/fragmenthandler.hxx rename to include/oox/core/fragmenthandler.hxx diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx similarity index 100% rename from oox/inc/oox/core/fragmenthandler2.hxx rename to include/oox/core/fragmenthandler2.hxx diff --git a/oox/inc/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx similarity index 100% rename from oox/inc/oox/core/recordparser.hxx rename to include/oox/core/recordparser.hxx diff --git a/oox/inc/oox/core/relations.hxx b/include/oox/core/relations.hxx similarity index 100% rename from oox/inc/oox/core/relations.hxx rename to include/oox/core/relations.hxx diff --git a/oox/inc/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx similarity index 100% rename from oox/inc/oox/core/relationshandler.hxx rename to include/oox/core/relationshandler.hxx diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx similarity index 100% rename from oox/inc/oox/core/xmlfilterbase.hxx rename to include/oox/core/xmlfilterbase.hxx diff --git a/oox/inc/oox/dllapi.h b/include/oox/dllapi.h similarity index 100% rename from oox/inc/oox/dllapi.h rename to include/oox/dllapi.h diff --git a/oox/inc/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/axiscontext.hxx rename to include/oox/drawingml/chart/axiscontext.hxx diff --git a/oox/inc/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/axisconverter.hxx rename to include/oox/drawingml/chart/axisconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/axismodel.hxx rename to include/oox/drawingml/chart/axismodel.hxx diff --git a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartcontextbase.hxx rename to include/oox/drawingml/chart/chartcontextbase.hxx diff --git a/oox/inc/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartconverter.hxx rename to include/oox/drawingml/chart/chartconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx rename to include/oox/drawingml/chart/chartdrawingfragment.hxx diff --git a/oox/inc/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartspaceconverter.hxx rename to include/oox/drawingml/chart/chartspaceconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartspacefragment.hxx rename to include/oox/drawingml/chart/chartspacefragment.hxx diff --git a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/chartspacemodel.hxx rename to include/oox/drawingml/chart/chartspacemodel.hxx diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/converterbase.hxx rename to include/oox/drawingml/chart/converterbase.hxx diff --git a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/datasourcecontext.hxx rename to include/oox/drawingml/chart/datasourcecontext.hxx diff --git a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/datasourceconverter.hxx rename to include/oox/drawingml/chart/datasourceconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/datasourcemodel.hxx rename to include/oox/drawingml/chart/datasourcemodel.hxx diff --git a/oox/inc/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/modelbase.hxx rename to include/oox/drawingml/chart/modelbase.hxx diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/objectformatter.hxx rename to include/oox/drawingml/chart/objectformatter.hxx diff --git a/oox/inc/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/plotareacontext.hxx rename to include/oox/drawingml/chart/plotareacontext.hxx diff --git a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/plotareaconverter.hxx rename to include/oox/drawingml/chart/plotareaconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/plotareamodel.hxx rename to include/oox/drawingml/chart/plotareamodel.hxx diff --git a/oox/inc/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/seriescontext.hxx rename to include/oox/drawingml/chart/seriescontext.hxx diff --git a/oox/inc/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/seriesconverter.hxx rename to include/oox/drawingml/chart/seriesconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/seriesmodel.hxx rename to include/oox/drawingml/chart/seriesmodel.hxx diff --git a/oox/inc/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/titlecontext.hxx rename to include/oox/drawingml/chart/titlecontext.hxx diff --git a/oox/inc/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/titleconverter.hxx rename to include/oox/drawingml/chart/titleconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/titlemodel.hxx rename to include/oox/drawingml/chart/titlemodel.hxx diff --git a/oox/inc/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/typegroupcontext.hxx rename to include/oox/drawingml/chart/typegroupcontext.hxx diff --git a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/typegroupconverter.hxx rename to include/oox/drawingml/chart/typegroupconverter.hxx diff --git a/oox/inc/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx similarity index 100% rename from oox/inc/oox/drawingml/chart/typegroupmodel.hxx rename to include/oox/drawingml/chart/typegroupmodel.hxx diff --git a/oox/inc/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx similarity index 100% rename from oox/inc/oox/drawingml/clrscheme.hxx rename to include/oox/drawingml/clrscheme.hxx diff --git a/oox/inc/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/clrschemecontext.hxx rename to include/oox/drawingml/clrschemecontext.hxx diff --git a/oox/inc/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx similarity index 100% rename from oox/inc/oox/drawingml/color.hxx rename to include/oox/drawingml/color.hxx diff --git a/oox/inc/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/colorchoicecontext.hxx rename to include/oox/drawingml/colorchoicecontext.hxx diff --git a/oox/inc/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/connectorshapecontext.hxx rename to include/oox/drawingml/connectorshapecontext.hxx diff --git a/oox/inc/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx similarity index 100% rename from oox/inc/oox/drawingml/customshapegeometry.hxx rename to include/oox/drawingml/customshapegeometry.hxx diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/customshapeproperties.hxx rename to include/oox/drawingml/customshapeproperties.hxx diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx b/include/oox/drawingml/diagram/diagram.hxx similarity index 100% rename from oox/inc/oox/drawingml/diagram/diagram.hxx rename to include/oox/drawingml/diagram/diagram.hxx diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx similarity index 100% rename from oox/inc/oox/drawingml/drawingmltypes.hxx rename to include/oox/drawingml/drawingmltypes.hxx diff --git a/oox/inc/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/effectproperties.hxx rename to include/oox/drawingml/effectproperties.hxx diff --git a/oox/inc/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/effectpropertiescontext.hxx rename to include/oox/drawingml/effectpropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx b/include/oox/drawingml/embeddedwavaudiofile.hxx similarity index 100% rename from oox/inc/oox/drawingml/embeddedwavaudiofile.hxx rename to include/oox/drawingml/embeddedwavaudiofile.hxx diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/fillproperties.hxx rename to include/oox/drawingml/fillproperties.hxx diff --git a/oox/inc/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/fillpropertiesgroupcontext.hxx rename to include/oox/drawingml/fillpropertiesgroupcontext.hxx diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/graphicshapecontext.hxx rename to include/oox/drawingml/graphicshapecontext.hxx diff --git a/oox/inc/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/guidcontext.hxx rename to include/oox/drawingml/guidcontext.hxx diff --git a/oox/inc/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/lineproperties.hxx rename to include/oox/drawingml/lineproperties.hxx diff --git a/oox/inc/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/linepropertiescontext.hxx rename to include/oox/drawingml/linepropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/objectdefaultcontext.hxx rename to include/oox/drawingml/objectdefaultcontext.hxx diff --git a/oox/inc/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/scene3dcontext.hxx rename to include/oox/drawingml/scene3dcontext.hxx diff --git a/oox/inc/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx similarity index 100% rename from oox/inc/oox/drawingml/shape.hxx rename to include/oox/drawingml/shape.hxx diff --git a/oox/inc/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/shape3dproperties.hxx rename to include/oox/drawingml/shape3dproperties.hxx diff --git a/oox/inc/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/shapecontext.hxx rename to include/oox/drawingml/shapecontext.hxx diff --git a/oox/inc/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/shapegroupcontext.hxx rename to include/oox/drawingml/shapegroupcontext.hxx diff --git a/oox/inc/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/shapepropertiescontext.hxx rename to include/oox/drawingml/shapepropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx similarity index 100% rename from oox/inc/oox/drawingml/shapepropertymap.hxx rename to include/oox/drawingml/shapepropertymap.hxx diff --git a/oox/inc/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/shapestylecontext.hxx rename to include/oox/drawingml/shapestylecontext.hxx diff --git a/oox/inc/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/spdefcontext.hxx rename to include/oox/drawingml/spdefcontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablebackgroundstylecontext.hxx b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablebackgroundstylecontext.hxx rename to include/oox/drawingml/table/tablebackgroundstylecontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablecell.hxx b/include/oox/drawingml/table/tablecell.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablecell.hxx rename to include/oox/drawingml/table/tablecell.hxx diff --git a/oox/inc/oox/drawingml/table/tablecellcontext.hxx b/include/oox/drawingml/table/tablecellcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablecellcontext.hxx rename to include/oox/drawingml/table/tablecellcontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablecontext.hxx b/include/oox/drawingml/table/tablecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablecontext.hxx rename to include/oox/drawingml/table/tablecontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablepartstylecontext.hxx b/include/oox/drawingml/table/tablepartstylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablepartstylecontext.hxx rename to include/oox/drawingml/table/tablepartstylecontext.hxx diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tableproperties.hxx rename to include/oox/drawingml/table/tableproperties.hxx diff --git a/oox/inc/oox/drawingml/table/tablerow.hxx b/include/oox/drawingml/table/tablerow.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablerow.hxx rename to include/oox/drawingml/table/tablerow.hxx diff --git a/oox/inc/oox/drawingml/table/tablerowcontext.hxx b/include/oox/drawingml/table/tablerowcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablerowcontext.hxx rename to include/oox/drawingml/table/tablerowcontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablestyle.hxx b/include/oox/drawingml/table/tablestyle.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestyle.hxx rename to include/oox/drawingml/table/tablestyle.hxx diff --git a/oox/inc/oox/drawingml/table/tablestylecellstylecontext.hxx b/include/oox/drawingml/table/tablestylecellstylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestylecellstylecontext.hxx rename to include/oox/drawingml/table/tablestylecellstylecontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablestylecontext.hxx b/include/oox/drawingml/table/tablestylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestylecontext.hxx rename to include/oox/drawingml/table/tablestylecontext.hxx diff --git a/oox/inc/oox/drawingml/table/tablestylelist.hxx b/include/oox/drawingml/table/tablestylelist.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestylelist.hxx rename to include/oox/drawingml/table/tablestylelist.hxx diff --git a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx rename to include/oox/drawingml/table/tablestylelistfragmenthandler.hxx diff --git a/oox/inc/oox/drawingml/table/tablestylepart.hxx b/include/oox/drawingml/table/tablestylepart.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestylepart.hxx rename to include/oox/drawingml/table/tablestylepart.hxx diff --git a/oox/inc/oox/drawingml/table/tablestyletextstylecontext.hxx b/include/oox/drawingml/table/tablestyletextstylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/table/tablestyletextstylecontext.hxx rename to include/oox/drawingml/table/tablestyletextstylecontext.hxx diff --git a/oox/inc/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx similarity index 100% rename from oox/inc/oox/drawingml/textbody.hxx rename to include/oox/drawingml/textbody.hxx diff --git a/oox/inc/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textbodycontext.hxx rename to include/oox/drawingml/textbodycontext.hxx diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/textbodyproperties.hxx rename to include/oox/drawingml/textbodyproperties.hxx diff --git a/oox/inc/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textbodypropertiescontext.hxx rename to include/oox/drawingml/textbodypropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/textcharacterproperties.hxx rename to include/oox/drawingml/textcharacterproperties.hxx diff --git a/oox/inc/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textcharacterpropertiescontext.hxx rename to include/oox/drawingml/textcharacterpropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx similarity index 100% rename from oox/inc/oox/drawingml/textfield.hxx rename to include/oox/drawingml/textfield.hxx diff --git a/oox/inc/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textfieldcontext.hxx rename to include/oox/drawingml/textfieldcontext.hxx diff --git a/oox/inc/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx similarity index 100% rename from oox/inc/oox/drawingml/textfont.hxx rename to include/oox/drawingml/textfont.hxx diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx similarity index 100% rename from oox/inc/oox/drawingml/textliststyle.hxx rename to include/oox/drawingml/textliststyle.hxx diff --git a/oox/inc/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textliststylecontext.hxx rename to include/oox/drawingml/textliststylecontext.hxx diff --git a/oox/inc/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx similarity index 100% rename from oox/inc/oox/drawingml/textparagraph.hxx rename to include/oox/drawingml/textparagraph.hxx diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx similarity index 100% rename from oox/inc/oox/drawingml/textparagraphproperties.hxx rename to include/oox/drawingml/textparagraphproperties.hxx diff --git a/oox/inc/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/textparagraphpropertiescontext.hxx rename to include/oox/drawingml/textparagraphpropertiescontext.hxx diff --git a/oox/inc/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx similarity index 100% rename from oox/inc/oox/drawingml/textrun.hxx rename to include/oox/drawingml/textrun.hxx diff --git a/oox/inc/oox/drawingml/textspacing.hxx b/include/oox/drawingml/textspacing.hxx similarity index 100% rename from oox/inc/oox/drawingml/textspacing.hxx rename to include/oox/drawingml/textspacing.hxx diff --git a/oox/inc/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx similarity index 100% rename from oox/inc/oox/drawingml/theme.hxx rename to include/oox/drawingml/theme.hxx diff --git a/oox/inc/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/themeelementscontext.hxx rename to include/oox/drawingml/themeelementscontext.hxx diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx similarity index 100% rename from oox/inc/oox/drawingml/themefragmenthandler.hxx rename to include/oox/drawingml/themefragmenthandler.hxx diff --git a/oox/inc/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx similarity index 100% rename from oox/inc/oox/drawingml/transform2dcontext.hxx rename to include/oox/drawingml/transform2dcontext.hxx diff --git a/oox/inc/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx similarity index 100% rename from oox/inc/oox/dump/dffdumper.hxx rename to include/oox/dump/dffdumper.hxx diff --git a/oox/inc/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx similarity index 100% rename from oox/inc/oox/dump/dumperbase.hxx rename to include/oox/dump/dumperbase.hxx diff --git a/oox/inc/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx similarity index 100% rename from oox/inc/oox/dump/oledumper.hxx rename to include/oox/dump/oledumper.hxx diff --git a/oox/inc/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx similarity index 100% rename from oox/inc/oox/dump/pptxdumper.hxx rename to include/oox/dump/pptxdumper.hxx diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx similarity index 100% rename from oox/inc/oox/dump/xlsbdumper.hxx rename to include/oox/dump/xlsbdumper.hxx diff --git a/oox/inc/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx similarity index 100% rename from oox/inc/oox/export/chartexport.hxx rename to include/oox/export/chartexport.hxx diff --git a/oox/inc/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx similarity index 100% rename from oox/inc/oox/export/drawingml.hxx rename to include/oox/export/drawingml.hxx diff --git a/oox/inc/oox/export/shapes.hxx b/include/oox/export/shapes.hxx similarity index 100% rename from oox/inc/oox/export/shapes.hxx rename to include/oox/export/shapes.hxx diff --git a/oox/inc/oox/export/utils.hxx b/include/oox/export/utils.hxx similarity index 100% rename from oox/inc/oox/export/utils.hxx rename to include/oox/export/utils.hxx diff --git a/oox/inc/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx similarity index 100% rename from oox/inc/oox/export/vmlexport.hxx rename to include/oox/export/vmlexport.hxx diff --git a/oox/inc/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx similarity index 100% rename from oox/inc/oox/helper/attributelist.hxx rename to include/oox/helper/attributelist.hxx diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx similarity index 100% rename from oox/inc/oox/helper/binaryinputstream.hxx rename to include/oox/helper/binaryinputstream.hxx diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx similarity index 100% rename from oox/inc/oox/helper/binaryoutputstream.hxx rename to include/oox/helper/binaryoutputstream.hxx diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx similarity index 100% rename from oox/inc/oox/helper/binarystreambase.hxx rename to include/oox/helper/binarystreambase.hxx diff --git a/oox/inc/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx similarity index 100% rename from oox/inc/oox/helper/containerhelper.hxx rename to include/oox/helper/containerhelper.hxx diff --git a/oox/inc/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx similarity index 100% rename from oox/inc/oox/helper/graphichelper.hxx rename to include/oox/helper/graphichelper.hxx diff --git a/oox/inc/oox/helper/helper.hxx b/include/oox/helper/helper.hxx similarity index 100% rename from oox/inc/oox/helper/helper.hxx rename to include/oox/helper/helper.hxx diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx similarity index 100% rename from oox/inc/oox/helper/modelobjecthelper.hxx rename to include/oox/helper/modelobjecthelper.hxx diff --git a/oox/inc/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx similarity index 100% rename from oox/inc/oox/helper/progressbar.hxx rename to include/oox/helper/progressbar.hxx diff --git a/oox/inc/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx similarity index 100% rename from oox/inc/oox/helper/propertymap.hxx rename to include/oox/helper/propertymap.hxx diff --git a/oox/inc/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx similarity index 100% rename from oox/inc/oox/helper/propertyset.hxx rename to include/oox/helper/propertyset.hxx diff --git a/oox/inc/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx similarity index 100% rename from oox/inc/oox/helper/refmap.hxx rename to include/oox/helper/refmap.hxx diff --git a/oox/inc/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx similarity index 100% rename from oox/inc/oox/helper/refvector.hxx rename to include/oox/helper/refvector.hxx diff --git a/oox/inc/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx similarity index 100% rename from oox/inc/oox/helper/storagebase.hxx rename to include/oox/helper/storagebase.hxx diff --git a/oox/inc/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx similarity index 100% rename from oox/inc/oox/helper/textinputstream.hxx rename to include/oox/helper/textinputstream.hxx diff --git a/oox/inc/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx similarity index 100% rename from oox/inc/oox/helper/zipstorage.hxx rename to include/oox/helper/zipstorage.hxx diff --git a/oox/inc/oox/mathml/export.hxx b/include/oox/mathml/export.hxx similarity index 100% rename from oox/inc/oox/mathml/export.hxx rename to include/oox/mathml/export.hxx diff --git a/oox/inc/oox/mathml/import.hxx b/include/oox/mathml/import.hxx similarity index 100% rename from oox/inc/oox/mathml/import.hxx rename to include/oox/mathml/import.hxx diff --git a/oox/inc/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx similarity index 100% rename from oox/inc/oox/mathml/importutils.hxx rename to include/oox/mathml/importutils.hxx diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx similarity index 100% rename from oox/inc/oox/ole/axbinaryreader.hxx rename to include/oox/ole/axbinaryreader.hxx diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx similarity index 100% rename from oox/inc/oox/ole/axbinarywriter.hxx rename to include/oox/ole/axbinarywriter.hxx diff --git a/oox/inc/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx similarity index 100% rename from oox/inc/oox/ole/axcontrol.hxx rename to include/oox/ole/axcontrol.hxx diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx similarity index 100% rename from oox/inc/oox/ole/axcontrolfragment.hxx rename to include/oox/ole/axcontrolfragment.hxx diff --git a/oox/inc/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx similarity index 100% rename from oox/inc/oox/ole/axfontdata.hxx rename to include/oox/ole/axfontdata.hxx diff --git a/oox/inc/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx similarity index 100% rename from oox/inc/oox/ole/olehelper.hxx rename to include/oox/ole/olehelper.hxx diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx similarity index 100% rename from oox/inc/oox/ole/oleobjecthelper.hxx rename to include/oox/ole/oleobjecthelper.hxx diff --git a/oox/inc/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx similarity index 100% rename from oox/inc/oox/ole/olestorage.hxx rename to include/oox/ole/olestorage.hxx diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx similarity index 100% rename from oox/inc/oox/ole/vbacontrol.hxx rename to include/oox/ole/vbacontrol.hxx diff --git a/oox/inc/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx similarity index 100% rename from oox/inc/oox/ole/vbahelper.hxx rename to include/oox/ole/vbahelper.hxx diff --git a/oox/inc/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx similarity index 100% rename from oox/inc/oox/ole/vbainputstream.hxx rename to include/oox/ole/vbainputstream.hxx diff --git a/oox/inc/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx similarity index 100% rename from oox/inc/oox/ole/vbamodule.hxx rename to include/oox/ole/vbamodule.hxx diff --git a/oox/inc/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx similarity index 100% rename from oox/inc/oox/ole/vbaproject.hxx rename to include/oox/ole/vbaproject.hxx diff --git a/oox/inc/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx similarity index 100% rename from oox/inc/oox/ppt/animationspersist.hxx rename to include/oox/ppt/animationspersist.hxx diff --git a/oox/inc/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx similarity index 100% rename from oox/inc/oox/ppt/backgroundproperties.hxx rename to include/oox/ppt/backgroundproperties.hxx diff --git a/oox/inc/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx similarity index 100% rename from oox/inc/oox/ppt/comments.hxx rename to include/oox/ppt/comments.hxx diff --git a/oox/inc/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx similarity index 100% rename from oox/inc/oox/ppt/customshowlistcontext.hxx rename to include/oox/ppt/customshowlistcontext.hxx diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx similarity index 100% rename from oox/inc/oox/ppt/dgmimport.hxx rename to include/oox/ppt/dgmimport.hxx diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx similarity index 100% rename from oox/inc/oox/ppt/dgmlayout.hxx rename to include/oox/ppt/dgmlayout.hxx diff --git a/oox/inc/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx similarity index 100% rename from oox/inc/oox/ppt/headerfooter.hxx rename to include/oox/ppt/headerfooter.hxx diff --git a/oox/inc/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx similarity index 100% rename from oox/inc/oox/ppt/layoutfragmenthandler.hxx rename to include/oox/ppt/layoutfragmenthandler.hxx diff --git a/oox/inc/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx similarity index 100% rename from oox/inc/oox/ppt/pptgraphicshapecontext.hxx rename to include/oox/ppt/pptgraphicshapecontext.hxx diff --git a/oox/inc/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx similarity index 100% rename from oox/inc/oox/ppt/pptimport.hxx rename to include/oox/ppt/pptimport.hxx diff --git a/oox/inc/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx similarity index 100% rename from oox/inc/oox/ppt/pptshape.hxx rename to include/oox/ppt/pptshape.hxx diff --git a/oox/inc/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx similarity index 100% rename from oox/inc/oox/ppt/pptshapecontext.hxx rename to include/oox/ppt/pptshapecontext.hxx diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx similarity index 100% rename from oox/inc/oox/ppt/pptshapegroupcontext.hxx rename to include/oox/ppt/pptshapegroupcontext.hxx diff --git a/oox/inc/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx similarity index 100% rename from oox/inc/oox/ppt/pptshapepropertiescontext.hxx rename to include/oox/ppt/pptshapepropertiescontext.hxx diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx similarity index 100% rename from oox/inc/oox/ppt/presentationfragmenthandler.hxx rename to include/oox/ppt/presentationfragmenthandler.hxx diff --git a/oox/inc/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx similarity index 100% rename from oox/inc/oox/ppt/slidefragmenthandler.hxx rename to include/oox/ppt/slidefragmenthandler.hxx diff --git a/oox/inc/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx similarity index 100% rename from oox/inc/oox/ppt/slidemastertextstylescontext.hxx rename to include/oox/ppt/slidemastertextstylescontext.hxx diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx similarity index 100% rename from oox/inc/oox/ppt/slidepersist.hxx rename to include/oox/ppt/slidepersist.hxx diff --git a/oox/inc/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx similarity index 100% rename from oox/inc/oox/ppt/slidetimingcontext.hxx rename to include/oox/ppt/slidetimingcontext.hxx diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx similarity index 100% rename from oox/inc/oox/ppt/slidetransition.hxx rename to include/oox/ppt/slidetransition.hxx diff --git a/oox/inc/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx similarity index 100% rename from oox/inc/oox/ppt/slidetransitioncontext.hxx rename to include/oox/ppt/slidetransitioncontext.hxx diff --git a/oox/inc/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx similarity index 100% rename from oox/inc/oox/ppt/soundactioncontext.hxx rename to include/oox/ppt/soundactioncontext.hxx diff --git a/oox/inc/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx similarity index 100% rename from oox/inc/oox/ppt/timenode.hxx rename to include/oox/ppt/timenode.hxx diff --git a/oox/inc/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx similarity index 100% rename from oox/inc/oox/ppt/timenodelistcontext.hxx rename to include/oox/ppt/timenodelistcontext.hxx diff --git a/oox/inc/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx similarity index 100% rename from oox/inc/oox/token/namespacemap.hxx rename to include/oox/token/namespacemap.hxx diff --git a/oox/inc/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx similarity index 100% rename from oox/inc/oox/token/propertynames.hxx rename to include/oox/token/propertynames.hxx diff --git a/oox/inc/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx similarity index 100% rename from oox/inc/oox/token/tokenmap.hxx rename to include/oox/token/tokenmap.hxx diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx similarity index 100% rename from oox/inc/oox/vml/vmldrawing.hxx rename to include/oox/vml/vmldrawing.hxx diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx similarity index 100% rename from oox/inc/oox/vml/vmldrawingfragment.hxx rename to include/oox/vml/vmldrawingfragment.hxx diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx similarity index 100% rename from oox/inc/oox/vml/vmlformatting.hxx rename to include/oox/vml/vmlformatting.hxx diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx similarity index 100% rename from oox/inc/oox/vml/vmlinputstream.hxx rename to include/oox/vml/vmlinputstream.hxx diff --git a/oox/inc/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx similarity index 100% rename from oox/inc/oox/vml/vmlshape.hxx rename to include/oox/vml/vmlshape.hxx diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx similarity index 100% rename from oox/inc/oox/vml/vmlshapecontainer.hxx rename to include/oox/vml/vmlshapecontainer.hxx diff --git a/oox/inc/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx similarity index 100% rename from oox/inc/oox/vml/vmlshapecontext.hxx rename to include/oox/vml/vmlshapecontext.hxx diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx similarity index 100% rename from oox/inc/oox/vml/vmltextbox.hxx rename to include/oox/vml/vmltextbox.hxx diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx similarity index 100% rename from oox/inc/oox/vml/vmltextboxcontext.hxx rename to include/oox/vml/vmltextboxcontext.hxx diff --git a/package/inc/package/Deflater.hxx b/include/package/Deflater.hxx similarity index 100% rename from package/inc/package/Deflater.hxx rename to include/package/Deflater.hxx diff --git a/package/inc/package/Inflater.hxx b/include/package/Inflater.hxx similarity index 100% rename from package/inc/package/Inflater.hxx rename to include/package/Inflater.hxx diff --git a/package/inc/package/packagedllapi.hxx b/include/package/packagedllapi.hxx similarity index 100% rename from package/inc/package/packagedllapi.hxx rename to include/package/packagedllapi.hxx diff --git a/registry/inc/registry/reader.h b/include/registry/reader.h similarity index 100% rename from registry/inc/registry/reader.h rename to include/registry/reader.h diff --git a/registry/inc/registry/reader.hxx b/include/registry/reader.hxx similarity index 100% rename from registry/inc/registry/reader.hxx rename to include/registry/reader.hxx diff --git a/registry/inc/registry/reflread.hxx b/include/registry/reflread.hxx similarity index 100% rename from registry/inc/registry/reflread.hxx rename to include/registry/reflread.hxx diff --git a/registry/inc/registry/refltype.hxx b/include/registry/refltype.hxx similarity index 100% rename from registry/inc/registry/refltype.hxx rename to include/registry/refltype.hxx diff --git a/registry/inc/registry/reflwrit.hxx b/include/registry/reflwrit.hxx similarity index 100% rename from registry/inc/registry/reflwrit.hxx rename to include/registry/reflwrit.hxx diff --git a/registry/inc/registry/regdllapi.h b/include/registry/regdllapi.h similarity index 100% rename from registry/inc/registry/regdllapi.h rename to include/registry/regdllapi.h diff --git a/registry/inc/registry/registry.h b/include/registry/registry.h similarity index 100% rename from registry/inc/registry/registry.h rename to include/registry/registry.h diff --git a/registry/inc/registry/registry.hxx b/include/registry/registry.hxx similarity index 100% rename from registry/inc/registry/registry.hxx rename to include/registry/registry.hxx diff --git a/registry/inc/registry/regtype.h b/include/registry/regtype.h similarity index 100% rename from registry/inc/registry/regtype.h rename to include/registry/regtype.h diff --git a/registry/inc/registry/types.h b/include/registry/types.h similarity index 100% rename from registry/inc/registry/types.h rename to include/registry/types.h diff --git a/registry/inc/registry/version.h b/include/registry/version.h similarity index 100% rename from registry/inc/registry/version.h rename to include/registry/version.h diff --git a/registry/inc/registry/writer.h b/include/registry/writer.h similarity index 100% rename from registry/inc/registry/writer.h rename to include/registry/writer.h diff --git a/registry/inc/registry/writer.hxx b/include/registry/writer.hxx similarity index 100% rename from registry/inc/registry/writer.hxx rename to include/registry/writer.hxx diff --git a/rsc/inc/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx similarity index 100% rename from rsc/inc/rsc/rsc-vcl-shared-types.hxx rename to include/rsc/rsc-vcl-shared-types.hxx diff --git a/rsc/inc/rsc/rscsfx.hxx b/include/rsc/rscsfx.hxx similarity index 100% rename from rsc/inc/rsc/rscsfx.hxx rename to include/rsc/rscsfx.hxx diff --git a/sax/inc/sax/fastattribs.hxx b/include/sax/fastattribs.hxx similarity index 100% rename from sax/inc/sax/fastattribs.hxx rename to include/sax/fastattribs.hxx diff --git a/sax/inc/sax/fshelper.hxx b/include/sax/fshelper.hxx similarity index 100% rename from sax/inc/sax/fshelper.hxx rename to include/sax/fshelper.hxx diff --git a/sax/inc/sax/saxdllapi.h b/include/sax/saxdllapi.h similarity index 100% rename from sax/inc/sax/saxdllapi.h rename to include/sax/saxdllapi.h diff --git a/sax/inc/sax/tools/converter.hxx b/include/sax/tools/converter.hxx similarity index 100% rename from sax/inc/sax/tools/converter.hxx rename to include/sax/tools/converter.hxx diff --git a/sax/inc/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx similarity index 100% rename from sax/inc/sax/tools/documenthandleradapter.hxx rename to include/sax/tools/documenthandleradapter.hxx diff --git a/sfx2/inc/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx similarity index 100% rename from sfx2/inc/sfx2/DocumentMetadataAccess.hxx rename to include/sfx2/DocumentMetadataAccess.hxx diff --git a/sfx2/inc/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx similarity index 100% rename from sfx2/inc/sfx2/Metadatable.hxx rename to include/sfx2/Metadatable.hxx diff --git a/sfx2/inc/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx similarity index 100% rename from sfx2/inc/sfx2/QuerySaveDocument.hxx rename to include/sfx2/QuerySaveDocument.hxx diff --git a/sfx2/inc/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx similarity index 100% rename from sfx2/inc/sfx2/XmlIdRegistry.hxx rename to include/sfx2/XmlIdRegistry.hxx diff --git a/sfx2/inc/sfx2/app.hxx b/include/sfx2/app.hxx similarity index 100% rename from sfx2/inc/sfx2/app.hxx rename to include/sfx2/app.hxx diff --git a/sfx2/inc/sfx2/appuno.hxx b/include/sfx2/appuno.hxx similarity index 100% rename from sfx2/inc/sfx2/appuno.hxx rename to include/sfx2/appuno.hxx diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx similarity index 100% rename from sfx2/inc/sfx2/basedlgs.hxx rename to include/sfx2/basedlgs.hxx diff --git a/sfx2/inc/sfx2/bindings.hxx b/include/sfx2/bindings.hxx similarity index 100% rename from sfx2/inc/sfx2/bindings.hxx rename to include/sfx2/bindings.hxx diff --git a/sfx2/inc/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx similarity index 100% rename from sfx2/inc/sfx2/brokenpackageint.hxx rename to include/sfx2/brokenpackageint.hxx diff --git a/sfx2/inc/sfx2/chalign.hxx b/include/sfx2/chalign.hxx similarity index 100% rename from sfx2/inc/sfx2/chalign.hxx rename to include/sfx2/chalign.hxx diff --git a/sfx2/inc/sfx2/checkin.hxx b/include/sfx2/checkin.hxx similarity index 100% rename from sfx2/inc/sfx2/checkin.hxx rename to include/sfx2/checkin.hxx diff --git a/sfx2/inc/sfx2/childwin.hxx b/include/sfx2/childwin.hxx similarity index 100% rename from sfx2/inc/sfx2/childwin.hxx rename to include/sfx2/childwin.hxx diff --git a/sfx2/inc/sfx2/cntids.hrc b/include/sfx2/cntids.hrc similarity index 100% rename from sfx2/inc/sfx2/cntids.hrc rename to include/sfx2/cntids.hrc diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx similarity index 100% rename from sfx2/inc/sfx2/controlwrapper.hxx rename to include/sfx2/controlwrapper.hxx diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx similarity index 100% rename from sfx2/inc/sfx2/ctrlitem.hxx rename to include/sfx2/ctrlitem.hxx diff --git a/sfx2/inc/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc similarity index 100% rename from sfx2/inc/sfx2/dialogs.hrc rename to include/sfx2/dialogs.hrc diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx similarity index 100% rename from sfx2/inc/sfx2/dinfdlg.hxx rename to include/sfx2/dinfdlg.hxx diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx similarity index 100% rename from sfx2/inc/sfx2/dinfedt.hxx rename to include/sfx2/dinfedt.hxx diff --git a/sfx2/inc/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx similarity index 100% rename from sfx2/inc/sfx2/dispatch.hxx rename to include/sfx2/dispatch.hxx diff --git a/sfx2/inc/sfx2/dllapi.h b/include/sfx2/dllapi.h similarity index 100% rename from sfx2/inc/sfx2/dllapi.h rename to include/sfx2/dllapi.h diff --git a/sfx2/inc/sfx2/docfac.hxx b/include/sfx2/docfac.hxx similarity index 100% rename from sfx2/inc/sfx2/docfac.hxx rename to include/sfx2/docfac.hxx diff --git a/sfx2/inc/sfx2/docfile.hxx b/include/sfx2/docfile.hxx similarity index 100% rename from sfx2/inc/sfx2/docfile.hxx rename to include/sfx2/docfile.hxx diff --git a/sfx2/inc/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx similarity index 100% rename from sfx2/inc/sfx2/docfilt.hxx rename to include/sfx2/docfilt.hxx diff --git a/sfx2/inc/sfx2/docinf.hxx b/include/sfx2/docinf.hxx similarity index 100% rename from sfx2/inc/sfx2/docinf.hxx rename to include/sfx2/docinf.hxx diff --git a/sfx2/inc/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx similarity index 100% rename from sfx2/inc/sfx2/docinsert.hxx rename to include/sfx2/docinsert.hxx diff --git a/sfx2/inc/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx similarity index 100% rename from sfx2/inc/sfx2/dockwin.hxx rename to include/sfx2/dockwin.hxx diff --git a/sfx2/inc/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx similarity index 100% rename from sfx2/inc/sfx2/docmacromode.hxx rename to include/sfx2/docmacromode.hxx diff --git a/sfx2/inc/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx similarity index 100% rename from sfx2/inc/sfx2/docstoragemodifylistener.hxx rename to include/sfx2/docstoragemodifylistener.hxx diff --git a/sfx2/inc/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx similarity index 100% rename from sfx2/inc/sfx2/doctempl.hxx rename to include/sfx2/doctempl.hxx diff --git a/sfx2/inc/sfx2/event.hxx b/include/sfx2/event.hxx similarity index 100% rename from sfx2/inc/sfx2/event.hxx rename to include/sfx2/event.hxx diff --git a/sfx2/inc/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx similarity index 100% rename from sfx2/inc/sfx2/evntconf.hxx rename to include/sfx2/evntconf.hxx diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx similarity index 100% rename from sfx2/inc/sfx2/fcontnr.hxx rename to include/sfx2/fcontnr.hxx diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx similarity index 100% rename from sfx2/inc/sfx2/filedlghelper.hxx rename to include/sfx2/filedlghelper.hxx diff --git a/sfx2/inc/sfx2/frame.hxx b/include/sfx2/frame.hxx similarity index 100% rename from sfx2/inc/sfx2/frame.hxx rename to include/sfx2/frame.hxx diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx similarity index 100% rename from sfx2/inc/sfx2/frmdescr.hxx rename to include/sfx2/frmdescr.hxx diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx similarity index 100% rename from sfx2/inc/sfx2/frmhtml.hxx rename to include/sfx2/frmhtml.hxx diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx similarity index 100% rename from sfx2/inc/sfx2/frmhtmlw.hxx rename to include/sfx2/frmhtmlw.hxx diff --git a/sfx2/inc/sfx2/genlink.hxx b/include/sfx2/genlink.hxx similarity index 100% rename from sfx2/inc/sfx2/genlink.hxx rename to include/sfx2/genlink.hxx diff --git a/sfx2/inc/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx similarity index 100% rename from sfx2/inc/sfx2/hintpost.hxx rename to include/sfx2/hintpost.hxx diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx similarity index 100% rename from sfx2/inc/sfx2/htmlmode.hxx rename to include/sfx2/htmlmode.hxx diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx similarity index 100% rename from sfx2/inc/sfx2/imagemgr.hxx rename to include/sfx2/imagemgr.hxx diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx similarity index 100% rename from sfx2/inc/sfx2/imgmgr.hxx rename to include/sfx2/imgmgr.hxx diff --git a/sfx2/inc/sfx2/infobar.hxx b/include/sfx2/infobar.hxx similarity index 100% rename from sfx2/inc/sfx2/infobar.hxx rename to include/sfx2/infobar.hxx diff --git a/sfx2/inc/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx similarity index 100% rename from sfx2/inc/sfx2/ipclient.hxx rename to include/sfx2/ipclient.hxx diff --git a/sfx2/inc/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx similarity index 100% rename from sfx2/inc/sfx2/itemconnect.hxx rename to include/sfx2/itemconnect.hxx diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx similarity index 100% rename from sfx2/inc/sfx2/itemwrapper.hxx rename to include/sfx2/itemwrapper.hxx diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx similarity index 100% rename from sfx2/inc/sfx2/linkmgr.hxx rename to include/sfx2/linkmgr.hxx diff --git a/sfx2/inc/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx similarity index 100% rename from sfx2/inc/sfx2/linksrc.hxx rename to include/sfx2/linksrc.hxx diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx similarity index 100% rename from sfx2/inc/sfx2/lnkbase.hxx rename to include/sfx2/lnkbase.hxx diff --git a/sfx2/inc/sfx2/macropg.hxx b/include/sfx2/macropg.hxx similarity index 100% rename from sfx2/inc/sfx2/macropg.hxx rename to include/sfx2/macropg.hxx diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx similarity index 100% rename from sfx2/inc/sfx2/mailmodelapi.hxx rename to include/sfx2/mailmodelapi.hxx diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx similarity index 100% rename from sfx2/inc/sfx2/mgetempl.hxx rename to include/sfx2/mgetempl.hxx diff --git a/sfx2/inc/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx similarity index 100% rename from sfx2/inc/sfx2/mieclip.hxx rename to include/sfx2/mieclip.hxx diff --git a/sfx2/inc/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx similarity index 100% rename from sfx2/inc/sfx2/minfitem.hxx rename to include/sfx2/minfitem.hxx diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx similarity index 100% rename from sfx2/inc/sfx2/mnuitem.hxx rename to include/sfx2/mnuitem.hxx diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx similarity index 100% rename from sfx2/inc/sfx2/mnumgr.hxx rename to include/sfx2/mnumgr.hxx diff --git a/sfx2/inc/sfx2/module.hxx b/include/sfx2/module.hxx similarity index 100% rename from sfx2/inc/sfx2/module.hxx rename to include/sfx2/module.hxx diff --git a/sfx2/inc/sfx2/msg.hxx b/include/sfx2/msg.hxx similarity index 100% rename from sfx2/inc/sfx2/msg.hxx rename to include/sfx2/msg.hxx diff --git a/sfx2/inc/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx similarity index 100% rename from sfx2/inc/sfx2/msgpool.hxx rename to include/sfx2/msgpool.hxx diff --git a/sfx2/inc/sfx2/navigat.hxx b/include/sfx2/navigat.hxx similarity index 100% rename from sfx2/inc/sfx2/navigat.hxx rename to include/sfx2/navigat.hxx diff --git a/sfx2/inc/sfx2/new.hxx b/include/sfx2/new.hxx similarity index 100% rename from sfx2/inc/sfx2/new.hxx rename to include/sfx2/new.hxx diff --git a/sfx2/inc/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx similarity index 100% rename from sfx2/inc/sfx2/newstyle.hxx rename to include/sfx2/newstyle.hxx diff --git a/sfx2/inc/sfx2/objface.hxx b/include/sfx2/objface.hxx similarity index 100% rename from sfx2/inc/sfx2/objface.hxx rename to include/sfx2/objface.hxx diff --git a/sfx2/inc/sfx2/objitem.hxx b/include/sfx2/objitem.hxx similarity index 100% rename from sfx2/inc/sfx2/objitem.hxx rename to include/sfx2/objitem.hxx diff --git a/sfx2/inc/sfx2/objsh.hxx b/include/sfx2/objsh.hxx similarity index 100% rename from sfx2/inc/sfx2/objsh.hxx rename to include/sfx2/objsh.hxx diff --git a/sfx2/inc/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx similarity index 100% rename from sfx2/inc/sfx2/opengrf.hxx rename to include/sfx2/opengrf.hxx diff --git a/sfx2/inc/sfx2/passwd.hxx b/include/sfx2/passwd.hxx similarity index 100% rename from sfx2/inc/sfx2/passwd.hxx rename to include/sfx2/passwd.hxx diff --git a/sfx2/inc/sfx2/printer.hxx b/include/sfx2/printer.hxx similarity index 100% rename from sfx2/inc/sfx2/printer.hxx rename to include/sfx2/printer.hxx diff --git a/sfx2/inc/sfx2/printopt.hxx b/include/sfx2/printopt.hxx similarity index 100% rename from sfx2/inc/sfx2/printopt.hxx rename to include/sfx2/printopt.hxx diff --git a/sfx2/inc/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx similarity index 100% rename from sfx2/inc/sfx2/prnmon.hxx rename to include/sfx2/prnmon.hxx diff --git a/sfx2/inc/sfx2/progress.hxx b/include/sfx2/progress.hxx similarity index 100% rename from sfx2/inc/sfx2/progress.hxx rename to include/sfx2/progress.hxx diff --git a/sfx2/inc/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx similarity index 100% rename from sfx2/inc/sfx2/querystatus.hxx rename to include/sfx2/querystatus.hxx diff --git a/sfx2/inc/sfx2/request.hxx b/include/sfx2/request.hxx similarity index 100% rename from sfx2/inc/sfx2/request.hxx rename to include/sfx2/request.hxx diff --git a/sfx2/inc/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx similarity index 100% rename from sfx2/inc/sfx2/securitypage.hxx rename to include/sfx2/securitypage.hxx diff --git a/sfx2/inc/sfx2/sfx.hrc b/include/sfx2/sfx.hrc similarity index 100% rename from sfx2/inc/sfx2/sfx.hrc rename to include/sfx2/sfx.hrc diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxbasecontroller.hxx rename to include/sfx2/sfxbasecontroller.hxx diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxbasemodel.hxx rename to include/sfx2/sfxbasemodel.hxx diff --git a/sfx2/inc/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h similarity index 100% rename from sfx2/inc/sfx2/sfxcommands.h rename to include/sfx2/sfxcommands.h diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/include/sfx2/sfxdefs.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxdefs.hxx rename to include/sfx2/sfxdefs.hxx diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxdlg.hxx rename to include/sfx2/sfxdlg.hxx diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxhelp.hxx rename to include/sfx2/sfxhelp.hxx diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxhtml.hxx rename to include/sfx2/sfxhtml.hxx diff --git a/sfx2/inc/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxmodelfactory.hxx rename to include/sfx2/sfxmodelfactory.hxx diff --git a/sfx2/inc/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxresid.hxx rename to include/sfx2/sfxresid.hxx diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc similarity index 100% rename from sfx2/inc/sfx2/sfxsids.hrc rename to include/sfx2/sfxsids.hrc diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxstatuslistener.hxx rename to include/sfx2/sfxstatuslistener.hxx diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx similarity index 100% rename from sfx2/inc/sfx2/sfxuno.hxx rename to include/sfx2/sfxuno.hxx diff --git a/sfx2/inc/sfx2/shell.hxx b/include/sfx2/shell.hxx similarity index 100% rename from sfx2/inc/sfx2/shell.hxx rename to include/sfx2/shell.hxx diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx similarity index 100% rename from sfx2/inc/sfx2/signaturestate.hxx rename to include/sfx2/signaturestate.hxx diff --git a/sfx2/inc/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx similarity index 100% rename from sfx2/inc/sfx2/stbitem.hxx rename to include/sfx2/stbitem.hxx diff --git a/sfx2/inc/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx similarity index 100% rename from sfx2/inc/sfx2/styfitem.hxx rename to include/sfx2/styfitem.hxx diff --git a/sfx2/inc/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx similarity index 100% rename from sfx2/inc/sfx2/styledlg.hxx rename to include/sfx2/styledlg.hxx diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx similarity index 100% rename from sfx2/inc/sfx2/tabdlg.hxx rename to include/sfx2/tabdlg.hxx diff --git a/sfx2/inc/sfx2/tabpage.hrc b/include/sfx2/tabpage.hrc similarity index 100% rename from sfx2/inc/sfx2/tabpage.hrc rename to include/sfx2/tabpage.hrc diff --git a/sfx2/inc/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx similarity index 100% rename from sfx2/inc/sfx2/taskpane.hxx rename to include/sfx2/taskpane.hxx diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx similarity index 100% rename from sfx2/inc/sfx2/tbxctrl.hxx rename to include/sfx2/tbxctrl.hxx diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx similarity index 100% rename from sfx2/inc/sfx2/templateabstractview.hxx rename to include/sfx2/templateabstractview.hxx diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx similarity index 100% rename from sfx2/inc/sfx2/templatecontaineritem.hxx rename to include/sfx2/templatecontaineritem.hxx diff --git a/sfx2/inc/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx similarity index 100% rename from sfx2/inc/sfx2/templateinfodlg.hxx rename to include/sfx2/templateinfodlg.hxx diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx similarity index 100% rename from sfx2/inc/sfx2/templatelocalview.hxx rename to include/sfx2/templatelocalview.hxx diff --git a/sfx2/inc/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc similarity index 100% rename from sfx2/inc/sfx2/templatelocnames.hrc rename to include/sfx2/templatelocnames.hrc diff --git a/sfx2/inc/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx similarity index 100% rename from sfx2/inc/sfx2/templateproperties.hxx rename to include/sfx2/templateproperties.hxx diff --git a/sfx2/inc/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx similarity index 100% rename from sfx2/inc/sfx2/templateremoteview.hxx rename to include/sfx2/templateremoteview.hxx diff --git a/sfx2/inc/sfx2/templaterepository.hxx b/include/sfx2/templaterepository.hxx similarity index 100% rename from sfx2/inc/sfx2/templaterepository.hxx rename to include/sfx2/templaterepository.hxx diff --git a/sfx2/inc/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx similarity index 100% rename from sfx2/inc/sfx2/templateviewitem.hxx rename to include/sfx2/templateviewitem.hxx diff --git a/sfx2/inc/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx similarity index 100% rename from sfx2/inc/sfx2/templdlg.hxx rename to include/sfx2/templdlg.hxx diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx similarity index 100% rename from sfx2/inc/sfx2/thumbnailview.hxx rename to include/sfx2/thumbnailview.hxx diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx similarity index 100% rename from sfx2/inc/sfx2/thumbnailviewitem.hxx rename to include/sfx2/thumbnailviewitem.hxx diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx similarity index 100% rename from sfx2/inc/sfx2/titledockwin.hxx rename to include/sfx2/titledockwin.hxx diff --git a/sfx2/inc/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx similarity index 100% rename from sfx2/inc/sfx2/tplpitem.hxx rename to include/sfx2/tplpitem.hxx diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx similarity index 100% rename from sfx2/inc/sfx2/unoctitm.hxx rename to include/sfx2/unoctitm.hxx diff --git a/sfx2/inc/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx similarity index 100% rename from sfx2/inc/sfx2/userinputinterception.hxx rename to include/sfx2/userinputinterception.hxx diff --git a/sfx2/inc/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx similarity index 100% rename from sfx2/inc/sfx2/viewfac.hxx rename to include/sfx2/viewfac.hxx diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx similarity index 100% rename from sfx2/inc/sfx2/viewfrm.hxx rename to include/sfx2/viewfrm.hxx diff --git a/sfx2/inc/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx similarity index 100% rename from sfx2/inc/sfx2/viewsh.hxx rename to include/sfx2/viewsh.hxx diff --git a/sfx2/inc/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx similarity index 100% rename from sfx2/inc/sfx2/zoomitem.hxx rename to include/sfx2/zoomitem.hxx diff --git a/shell/inc/shell/kde_headers.h b/include/shell/kde_headers.h similarity index 100% rename from shell/inc/shell/kde_headers.h rename to include/shell/kde_headers.h diff --git a/shell/inc/shell/tde_defines.h b/include/shell/tde_defines.h similarity index 100% rename from shell/inc/shell/tde_defines.h rename to include/shell/tde_defines.h diff --git a/shell/inc/shell/tde_headers.h b/include/shell/tde_headers.h similarity index 100% rename from shell/inc/shell/tde_headers.h rename to include/shell/tde_headers.h diff --git a/sot/inc/sot/exchange.hxx b/include/sot/exchange.hxx similarity index 100% rename from sot/inc/sot/exchange.hxx rename to include/sot/exchange.hxx diff --git a/sot/inc/sot/factory.hxx b/include/sot/factory.hxx similarity index 100% rename from sot/inc/sot/factory.hxx rename to include/sot/factory.hxx diff --git a/sot/inc/sot/filelist.hxx b/include/sot/filelist.hxx similarity index 100% rename from sot/inc/sot/filelist.hxx rename to include/sot/filelist.hxx diff --git a/sot/inc/sot/formats.hxx b/include/sot/formats.hxx similarity index 100% rename from sot/inc/sot/formats.hxx rename to include/sot/formats.hxx diff --git a/sot/inc/sot/object.hxx b/include/sot/object.hxx similarity index 100% rename from sot/inc/sot/object.hxx rename to include/sot/object.hxx diff --git a/sot/inc/sot/sotdata.hxx b/include/sot/sotdata.hxx similarity index 100% rename from sot/inc/sot/sotdata.hxx rename to include/sot/sotdata.hxx diff --git a/sot/inc/sot/sotdllapi.h b/include/sot/sotdllapi.h similarity index 100% rename from sot/inc/sot/sotdllapi.h rename to include/sot/sotdllapi.h diff --git a/sot/inc/sot/stg.hxx b/include/sot/stg.hxx similarity index 100% rename from sot/inc/sot/stg.hxx rename to include/sot/stg.hxx diff --git a/sot/inc/sot/storage.hxx b/include/sot/storage.hxx similarity index 100% rename from sot/inc/sot/storage.hxx rename to include/sot/storage.hxx diff --git a/sot/inc/sot/storinfo.hxx b/include/sot/storinfo.hxx similarity index 100% rename from sot/inc/sot/storinfo.hxx rename to include/sot/storinfo.hxx diff --git a/store/inc/store/store.h b/include/store/store.h similarity index 100% rename from store/inc/store/store.h rename to include/store/store.h diff --git a/store/inc/store/store.hxx b/include/store/store.hxx similarity index 100% rename from store/inc/store/store.hxx rename to include/store/store.hxx diff --git a/store/inc/store/storedllapi.h b/include/store/storedllapi.h similarity index 100% rename from store/inc/store/storedllapi.h rename to include/store/storedllapi.h diff --git a/store/inc/store/types.h b/include/store/types.h similarity index 100% rename from store/inc/store/types.h rename to include/store/types.h diff --git a/svl/inc/svl/PasswordHelper.hxx b/include/svl/PasswordHelper.hxx similarity index 100% rename from svl/inc/svl/PasswordHelper.hxx rename to include/svl/PasswordHelper.hxx diff --git a/svl/inc/svl/adrparse.hxx b/include/svl/adrparse.hxx similarity index 100% rename from svl/inc/svl/adrparse.hxx rename to include/svl/adrparse.hxx diff --git a/svl/inc/svl/aeitem.hxx b/include/svl/aeitem.hxx similarity index 100% rename from svl/inc/svl/aeitem.hxx rename to include/svl/aeitem.hxx diff --git a/svl/inc/svl/asiancfg.hxx b/include/svl/asiancfg.hxx similarity index 100% rename from svl/inc/svl/asiancfg.hxx rename to include/svl/asiancfg.hxx diff --git a/svl/inc/svl/brdcst.hxx b/include/svl/brdcst.hxx similarity index 100% rename from svl/inc/svl/brdcst.hxx rename to include/svl/brdcst.hxx diff --git a/svl/inc/svl/broadcast.hxx b/include/svl/broadcast.hxx similarity index 100% rename from svl/inc/svl/broadcast.hxx rename to include/svl/broadcast.hxx diff --git a/svl/inc/svl/cenumitm.hxx b/include/svl/cenumitm.hxx similarity index 100% rename from svl/inc/svl/cenumitm.hxx rename to include/svl/cenumitm.hxx diff --git a/svl/inc/svl/cintitem.hxx b/include/svl/cintitem.hxx similarity index 100% rename from svl/inc/svl/cintitem.hxx rename to include/svl/cintitem.hxx diff --git a/svl/inc/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx similarity index 100% rename from svl/inc/svl/cjkoptions.hxx rename to include/svl/cjkoptions.hxx diff --git a/svl/inc/svl/cntwall.hxx b/include/svl/cntwall.hxx similarity index 100% rename from svl/inc/svl/cntwall.hxx rename to include/svl/cntwall.hxx diff --git a/svl/inc/svl/cntwids.hrc b/include/svl/cntwids.hrc similarity index 100% rename from svl/inc/svl/cntwids.hrc rename to include/svl/cntwids.hrc diff --git a/svl/inc/svl/converter.hxx b/include/svl/converter.hxx similarity index 100% rename from svl/inc/svl/converter.hxx rename to include/svl/converter.hxx diff --git a/svl/inc/svl/ctloptions.hxx b/include/svl/ctloptions.hxx similarity index 100% rename from svl/inc/svl/ctloptions.hxx rename to include/svl/ctloptions.hxx diff --git a/svl/inc/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx similarity index 100% rename from svl/inc/svl/ctypeitm.hxx rename to include/svl/ctypeitm.hxx diff --git a/svl/inc/svl/custritm.hxx b/include/svl/custritm.hxx similarity index 100% rename from svl/inc/svl/custritm.hxx rename to include/svl/custritm.hxx diff --git a/svl/inc/svl/dateitem.hxx b/include/svl/dateitem.hxx similarity index 100% rename from svl/inc/svl/dateitem.hxx rename to include/svl/dateitem.hxx diff --git a/svl/inc/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx similarity index 100% rename from svl/inc/svl/documentlockfile.hxx rename to include/svl/documentlockfile.hxx diff --git a/svl/inc/svl/eitem.hxx b/include/svl/eitem.hxx similarity index 100% rename from svl/inc/svl/eitem.hxx rename to include/svl/eitem.hxx diff --git a/svl/inc/svl/filenotation.hxx b/include/svl/filenotation.hxx similarity index 100% rename from svl/inc/svl/filenotation.hxx rename to include/svl/filenotation.hxx diff --git a/svl/inc/svl/filerec.hxx b/include/svl/filerec.hxx similarity index 100% rename from svl/inc/svl/filerec.hxx rename to include/svl/filerec.hxx diff --git a/svl/inc/svl/flagitem.hxx b/include/svl/flagitem.hxx similarity index 100% rename from svl/inc/svl/flagitem.hxx rename to include/svl/flagitem.hxx diff --git a/svl/inc/svl/folderrestriction.hxx b/include/svl/folderrestriction.hxx similarity index 100% rename from svl/inc/svl/folderrestriction.hxx rename to include/svl/folderrestriction.hxx diff --git a/svl/inc/svl/fstathelper.hxx b/include/svl/fstathelper.hxx similarity index 100% rename from svl/inc/svl/fstathelper.hxx rename to include/svl/fstathelper.hxx diff --git a/svl/inc/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx similarity index 100% rename from svl/inc/svl/globalnameitem.hxx rename to include/svl/globalnameitem.hxx diff --git a/svl/inc/svl/hint.hxx b/include/svl/hint.hxx similarity index 100% rename from svl/inc/svl/hint.hxx rename to include/svl/hint.hxx diff --git a/svl/inc/svl/ilstitem.hxx b/include/svl/ilstitem.hxx similarity index 100% rename from svl/inc/svl/ilstitem.hxx rename to include/svl/ilstitem.hxx diff --git a/svl/inc/svl/imageitm.hxx b/include/svl/imageitm.hxx similarity index 100% rename from svl/inc/svl/imageitm.hxx rename to include/svl/imageitm.hxx diff --git a/svl/inc/svl/inethist.hxx b/include/svl/inethist.hxx similarity index 100% rename from svl/inc/svl/inethist.hxx rename to include/svl/inethist.hxx diff --git a/svl/inc/svl/inettype.hxx b/include/svl/inettype.hxx similarity index 100% rename from svl/inc/svl/inettype.hxx rename to include/svl/inettype.hxx diff --git a/svl/inc/svl/instrm.hxx b/include/svl/instrm.hxx similarity index 100% rename from svl/inc/svl/instrm.hxx rename to include/svl/instrm.hxx diff --git a/svl/inc/svl/intitem.hxx b/include/svl/intitem.hxx similarity index 100% rename from svl/inc/svl/intitem.hxx rename to include/svl/intitem.hxx diff --git a/svl/inc/svl/isethint.hxx b/include/svl/isethint.hxx similarity index 100% rename from svl/inc/svl/isethint.hxx rename to include/svl/isethint.hxx diff --git a/svl/inc/svl/itemiter.hxx b/include/svl/itemiter.hxx similarity index 100% rename from svl/inc/svl/itemiter.hxx rename to include/svl/itemiter.hxx diff --git a/svl/inc/svl/itempool.hxx b/include/svl/itempool.hxx similarity index 100% rename from svl/inc/svl/itempool.hxx rename to include/svl/itempool.hxx diff --git a/svl/inc/svl/itemprop.hxx b/include/svl/itemprop.hxx similarity index 100% rename from svl/inc/svl/itemprop.hxx rename to include/svl/itemprop.hxx diff --git a/svl/inc/svl/itemset.hxx b/include/svl/itemset.hxx similarity index 100% rename from svl/inc/svl/itemset.hxx rename to include/svl/itemset.hxx diff --git a/svl/inc/svl/languageoptions.hxx b/include/svl/languageoptions.hxx similarity index 100% rename from svl/inc/svl/languageoptions.hxx rename to include/svl/languageoptions.hxx diff --git a/svl/inc/svl/lckbitem.hxx b/include/svl/lckbitem.hxx similarity index 100% rename from svl/inc/svl/lckbitem.hxx rename to include/svl/lckbitem.hxx diff --git a/svl/inc/svl/listener.hxx b/include/svl/listener.hxx similarity index 100% rename from svl/inc/svl/listener.hxx rename to include/svl/listener.hxx diff --git a/svl/inc/svl/listeneriter.hxx b/include/svl/listeneriter.hxx similarity index 100% rename from svl/inc/svl/listeneriter.hxx rename to include/svl/listeneriter.hxx diff --git a/svl/inc/svl/lngmisc.hxx b/include/svl/lngmisc.hxx similarity index 100% rename from svl/inc/svl/lngmisc.hxx rename to include/svl/lngmisc.hxx diff --git a/svl/inc/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx similarity index 100% rename from svl/inc/svl/lockfilecommon.hxx rename to include/svl/lockfilecommon.hxx diff --git a/svl/inc/svl/lstner.hxx b/include/svl/lstner.hxx similarity index 100% rename from svl/inc/svl/lstner.hxx rename to include/svl/lstner.hxx diff --git a/svl/inc/svl/macitem.hxx b/include/svl/macitem.hxx similarity index 100% rename from svl/inc/svl/macitem.hxx rename to include/svl/macitem.hxx diff --git a/svl/inc/svl/mailenum.hxx b/include/svl/mailenum.hxx similarity index 100% rename from svl/inc/svl/mailenum.hxx rename to include/svl/mailenum.hxx diff --git a/svl/inc/svl/memberid.hrc b/include/svl/memberid.hrc similarity index 100% rename from svl/inc/svl/memberid.hrc rename to include/svl/memberid.hrc diff --git a/svl/inc/svl/metitem.hxx b/include/svl/metitem.hxx similarity index 100% rename from svl/inc/svl/metitem.hxx rename to include/svl/metitem.hxx diff --git a/svl/inc/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx similarity index 100% rename from svl/inc/svl/nfkeytab.hxx rename to include/svl/nfkeytab.hxx diff --git a/svl/inc/svl/nfsymbol.hxx b/include/svl/nfsymbol.hxx similarity index 100% rename from svl/inc/svl/nfsymbol.hxx rename to include/svl/nfsymbol.hxx diff --git a/svl/inc/svl/nfversi.hxx b/include/svl/nfversi.hxx similarity index 100% rename from svl/inc/svl/nfversi.hxx rename to include/svl/nfversi.hxx diff --git a/svl/inc/svl/nranges.hxx b/include/svl/nranges.hxx similarity index 100% rename from svl/inc/svl/nranges.hxx rename to include/svl/nranges.hxx diff --git a/svl/inc/svl/numuno.hxx b/include/svl/numuno.hxx similarity index 100% rename from svl/inc/svl/numuno.hxx rename to include/svl/numuno.hxx diff --git a/svl/inc/svl/ondemand.hxx b/include/svl/ondemand.hxx similarity index 100% rename from svl/inc/svl/ondemand.hxx rename to include/svl/ondemand.hxx diff --git a/svl/inc/svl/outstrm.hxx b/include/svl/outstrm.hxx similarity index 100% rename from svl/inc/svl/outstrm.hxx rename to include/svl/outstrm.hxx diff --git a/svl/inc/svl/ownlist.hxx b/include/svl/ownlist.hxx similarity index 100% rename from svl/inc/svl/ownlist.hxx rename to include/svl/ownlist.hxx diff --git a/svl/inc/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx similarity index 100% rename from svl/inc/svl/pickerhistoryaccess.hxx rename to include/svl/pickerhistoryaccess.hxx diff --git a/svl/inc/svl/poolcach.hxx b/include/svl/poolcach.hxx similarity index 100% rename from svl/inc/svl/poolcach.hxx rename to include/svl/poolcach.hxx diff --git a/svl/inc/svl/poolitem.hxx b/include/svl/poolitem.hxx similarity index 100% rename from svl/inc/svl/poolitem.hxx rename to include/svl/poolitem.hxx diff --git a/svl/inc/svl/ptitem.hxx b/include/svl/ptitem.hxx similarity index 100% rename from svl/inc/svl/ptitem.hxx rename to include/svl/ptitem.hxx diff --git a/svl/inc/svl/rectitem.hxx b/include/svl/rectitem.hxx similarity index 100% rename from svl/inc/svl/rectitem.hxx rename to include/svl/rectitem.hxx diff --git a/svl/inc/svl/restrictedpaths.hxx b/include/svl/restrictedpaths.hxx similarity index 100% rename from svl/inc/svl/restrictedpaths.hxx rename to include/svl/restrictedpaths.hxx diff --git a/svl/inc/svl/rngitem.hxx b/include/svl/rngitem.hxx similarity index 100% rename from svl/inc/svl/rngitem.hxx rename to include/svl/rngitem.hxx diff --git a/svl/inc/svl/sfontitm.hxx b/include/svl/sfontitm.hxx similarity index 100% rename from svl/inc/svl/sfontitm.hxx rename to include/svl/sfontitm.hxx diff --git a/svl/inc/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx similarity index 100% rename from svl/inc/svl/sharecontrolfile.hxx rename to include/svl/sharecontrolfile.hxx diff --git a/svl/inc/svl/slstitm.hxx b/include/svl/slstitm.hxx similarity index 100% rename from svl/inc/svl/slstitm.hxx rename to include/svl/slstitm.hxx diff --git a/svl/inc/svl/smplhint.hxx b/include/svl/smplhint.hxx similarity index 100% rename from svl/inc/svl/smplhint.hxx rename to include/svl/smplhint.hxx diff --git a/svl/inc/svl/solar.hrc b/include/svl/solar.hrc similarity index 100% rename from svl/inc/svl/solar.hrc rename to include/svl/solar.hrc diff --git a/svl/inc/svl/srchdefs.hxx b/include/svl/srchdefs.hxx similarity index 100% rename from svl/inc/svl/srchdefs.hxx rename to include/svl/srchdefs.hxx diff --git a/svl/inc/svl/srchitem.hxx b/include/svl/srchitem.hxx similarity index 100% rename from svl/inc/svl/srchitem.hxx rename to include/svl/srchitem.hxx diff --git a/svl/inc/svl/stritem.hxx b/include/svl/stritem.hxx similarity index 100% rename from svl/inc/svl/stritem.hxx rename to include/svl/stritem.hxx diff --git a/svl/inc/svl/strmadpt.hxx b/include/svl/strmadpt.hxx similarity index 100% rename from svl/inc/svl/strmadpt.hxx rename to include/svl/strmadpt.hxx diff --git a/svl/inc/svl/style.hrc b/include/svl/style.hrc similarity index 100% rename from svl/inc/svl/style.hrc rename to include/svl/style.hrc diff --git a/svl/inc/svl/style.hxx b/include/svl/style.hxx similarity index 100% rename from svl/inc/svl/style.hxx rename to include/svl/style.hxx diff --git a/svl/inc/svl/stylepool.hxx b/include/svl/stylepool.hxx similarity index 100% rename from svl/inc/svl/stylepool.hxx rename to include/svl/stylepool.hxx diff --git a/svl/inc/svl/stylesheetuser.hxx b/include/svl/stylesheetuser.hxx similarity index 100% rename from svl/inc/svl/stylesheetuser.hxx rename to include/svl/stylesheetuser.hxx diff --git a/svl/inc/svl/svdde.hxx b/include/svl/svdde.hxx similarity index 100% rename from svl/inc/svl/svdde.hxx rename to include/svl/svdde.hxx diff --git a/svl/inc/svl/svl.hrc b/include/svl/svl.hrc similarity index 100% rename from svl/inc/svl/svl.hrc rename to include/svl/svl.hrc diff --git a/svl/inc/svl/svldllapi.h b/include/svl/svldllapi.h similarity index 100% rename from svl/inc/svl/svldllapi.h rename to include/svl/svldllapi.h diff --git a/svl/inc/svl/szitem.hxx b/include/svl/szitem.hxx similarity index 100% rename from svl/inc/svl/szitem.hxx rename to include/svl/szitem.hxx diff --git a/svl/inc/svl/undo.hxx b/include/svl/undo.hxx similarity index 100% rename from svl/inc/svl/undo.hxx rename to include/svl/undo.hxx diff --git a/svl/inc/svl/urihelper.hxx b/include/svl/urihelper.hxx similarity index 100% rename from svl/inc/svl/urihelper.hxx rename to include/svl/urihelper.hxx diff --git a/svl/inc/svl/urlbmk.hxx b/include/svl/urlbmk.hxx similarity index 100% rename from svl/inc/svl/urlbmk.hxx rename to include/svl/urlbmk.hxx diff --git a/svl/inc/svl/urlfilter.hxx b/include/svl/urlfilter.hxx similarity index 100% rename from svl/inc/svl/urlfilter.hxx rename to include/svl/urlfilter.hxx diff --git a/svl/inc/svl/visitem.hxx b/include/svl/visitem.hxx similarity index 100% rename from svl/inc/svl/visitem.hxx rename to include/svl/visitem.hxx diff --git a/svl/inc/svl/whiter.hxx b/include/svl/whiter.hxx similarity index 100% rename from svl/inc/svl/whiter.hxx rename to include/svl/whiter.hxx diff --git a/svl/inc/svl/xmlement.hxx b/include/svl/xmlement.hxx similarity index 100% rename from svl/inc/svl/xmlement.hxx rename to include/svl/xmlement.hxx diff --git a/svl/inc/svl/zforlist.hxx b/include/svl/zforlist.hxx similarity index 100% rename from svl/inc/svl/zforlist.hxx rename to include/svl/zforlist.hxx diff --git a/svl/inc/svl/zformat.hxx b/include/svl/zformat.hxx similarity index 100% rename from svl/inc/svl/zformat.hxx rename to include/svl/zformat.hxx diff --git a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx similarity index 100% rename from svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx rename to include/svtools/AccessibleBrowseBoxObjType.hxx diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx similarity index 100% rename from svtools/inc/svtools/DocumentInfoPreview.hxx rename to include/svtools/DocumentInfoPreview.hxx diff --git a/svtools/inc/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx similarity index 100% rename from svtools/inc/svtools/DocumentToGraphicRenderer.hxx rename to include/svtools/DocumentToGraphicRenderer.hxx diff --git a/svtools/inc/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx similarity index 100% rename from svtools/inc/svtools/GraphicExportOptionsDialog.hxx rename to include/svtools/GraphicExportOptionsDialog.hxx diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx similarity index 100% rename from svtools/inc/svtools/PlaceEditDialog.hxx rename to include/svtools/PlaceEditDialog.hxx diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/include/svtools/QueryFolderName.hxx similarity index 100% rename from svtools/inc/svtools/QueryFolderName.hxx rename to include/svtools/QueryFolderName.hxx diff --git a/svtools/inc/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx similarity index 100% rename from svtools/inc/svtools/ServerDetailsControls.hxx rename to include/svtools/ServerDetailsControls.hxx diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx similarity index 100% rename from svtools/inc/svtools/acceleratorexecute.hxx rename to include/svtools/acceleratorexecute.hxx diff --git a/svtools/inc/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx similarity index 100% rename from svtools/inc/svtools/accessibilityoptions.hxx rename to include/svtools/accessibilityoptions.hxx diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx similarity index 100% rename from svtools/inc/svtools/accessiblefactory.hxx rename to include/svtools/accessiblefactory.hxx diff --git a/svtools/inc/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx similarity index 100% rename from svtools/inc/svtools/accessibletable.hxx rename to include/svtools/accessibletable.hxx diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx similarity index 100% rename from svtools/inc/svtools/accessibletableprovider.hxx rename to include/svtools/accessibletableprovider.hxx diff --git a/svtools/inc/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx similarity index 100% rename from svtools/inc/svtools/addresstemplate.hxx rename to include/svtools/addresstemplate.hxx diff --git a/svtools/inc/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx similarity index 100% rename from svtools/inc/svtools/apearcfg.hxx rename to include/svtools/apearcfg.hxx diff --git a/svtools/inc/svtools/asynclink.hxx b/include/svtools/asynclink.hxx similarity index 100% rename from svtools/inc/svtools/asynclink.hxx rename to include/svtools/asynclink.hxx diff --git a/svtools/inc/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx similarity index 100% rename from svtools/inc/svtools/bindablecontrolhelper.hxx rename to include/svtools/bindablecontrolhelper.hxx diff --git a/svtools/inc/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx similarity index 100% rename from svtools/inc/svtools/borderhelper.hxx rename to include/svtools/borderhelper.hxx diff --git a/svtools/inc/svtools/brwbox.hxx b/include/svtools/brwbox.hxx similarity index 100% rename from svtools/inc/svtools/brwbox.hxx rename to include/svtools/brwbox.hxx diff --git a/svtools/inc/svtools/brwhead.hxx b/include/svtools/brwhead.hxx similarity index 100% rename from svtools/inc/svtools/brwhead.hxx rename to include/svtools/brwhead.hxx diff --git a/svtools/inc/svtools/calendar.hxx b/include/svtools/calendar.hxx similarity index 100% rename from svtools/inc/svtools/calendar.hxx rename to include/svtools/calendar.hxx diff --git a/svtools/inc/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx similarity index 100% rename from svtools/inc/svtools/cliplistener.hxx rename to include/svtools/cliplistener.hxx diff --git a/svtools/inc/svtools/collatorres.hxx b/include/svtools/collatorres.hxx similarity index 100% rename from svtools/inc/svtools/collatorres.hxx rename to include/svtools/collatorres.hxx diff --git a/svtools/inc/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx similarity index 100% rename from svtools/inc/svtools/colorcfg.hxx rename to include/svtools/colorcfg.hxx diff --git a/svtools/inc/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx similarity index 100% rename from svtools/inc/svtools/colrdlg.hxx rename to include/svtools/colrdlg.hxx diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx similarity index 100% rename from svtools/inc/svtools/contextmenuhelper.hxx rename to include/svtools/contextmenuhelper.hxx diff --git a/svtools/inc/svtools/controldims.hrc b/include/svtools/controldims.hrc similarity index 100% rename from svtools/inc/svtools/controldims.hrc rename to include/svtools/controldims.hrc diff --git a/svtools/inc/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx similarity index 100% rename from svtools/inc/svtools/ctrlbox.hxx rename to include/svtools/ctrlbox.hxx diff --git a/svtools/inc/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx similarity index 100% rename from svtools/inc/svtools/ctrltool.hxx rename to include/svtools/ctrltool.hxx diff --git a/svtools/inc/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx similarity index 100% rename from svtools/inc/svtools/dialogclosedlistener.hxx rename to include/svtools/dialogclosedlistener.hxx diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx similarity index 100% rename from svtools/inc/svtools/dialogcontrolling.hxx rename to include/svtools/dialogcontrolling.hxx diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx similarity index 100% rename from svtools/inc/svtools/editbrowsebox.hxx rename to include/svtools/editbrowsebox.hxx diff --git a/svtools/inc/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx similarity index 100% rename from svtools/inc/svtools/editimplementation.hxx rename to include/svtools/editimplementation.hxx diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx similarity index 100% rename from svtools/inc/svtools/editsyntaxhighlighter.hxx rename to include/svtools/editsyntaxhighlighter.hxx diff --git a/svtools/inc/svtools/ehdl.hxx b/include/svtools/ehdl.hxx similarity index 100% rename from svtools/inc/svtools/ehdl.hxx rename to include/svtools/ehdl.hxx diff --git a/svtools/inc/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx similarity index 100% rename from svtools/inc/svtools/embedhlp.hxx rename to include/svtools/embedhlp.hxx diff --git a/svtools/inc/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx similarity index 100% rename from svtools/inc/svtools/embedtransfer.hxx rename to include/svtools/embedtransfer.hxx diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx similarity index 100% rename from svtools/inc/svtools/extcolorcfg.hxx rename to include/svtools/extcolorcfg.hxx diff --git a/svtools/inc/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx similarity index 100% rename from svtools/inc/svtools/extensionlistbox.hxx rename to include/svtools/extensionlistbox.hxx diff --git a/svtools/inc/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx similarity index 100% rename from svtools/inc/svtools/filechangedchecker.hxx rename to include/svtools/filechangedchecker.hxx diff --git a/svtools/inc/svtools/filectrl.hxx b/include/svtools/filectrl.hxx similarity index 100% rename from svtools/inc/svtools/filectrl.hxx rename to include/svtools/filectrl.hxx diff --git a/svtools/inc/svtools/filedlg2.hrc b/include/svtools/filedlg2.hrc similarity index 100% rename from svtools/inc/svtools/filedlg2.hrc rename to include/svtools/filedlg2.hrc diff --git a/svtools/inc/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx similarity index 100% rename from svtools/inc/svtools/fileurlbox.hxx rename to include/svtools/fileurlbox.hxx diff --git a/svtools/inc/svtools/fileview.hxx b/include/svtools/fileview.hxx similarity index 100% rename from svtools/inc/svtools/fileview.hxx rename to include/svtools/fileview.hxx diff --git a/svtools/inc/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx similarity index 100% rename from svtools/inc/svtools/fmtfield.hxx rename to include/svtools/fmtfield.hxx diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx similarity index 100% rename from svtools/inc/svtools/fontsubstconfig.hxx rename to include/svtools/fontsubstconfig.hxx diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx similarity index 100% rename from svtools/inc/svtools/framestatuslistener.hxx rename to include/svtools/framestatuslistener.hxx diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx similarity index 100% rename from svtools/inc/svtools/generictoolboxcontroller.hxx rename to include/svtools/generictoolboxcontroller.hxx diff --git a/svtools/inc/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx similarity index 100% rename from svtools/inc/svtools/genericunodialog.hxx rename to include/svtools/genericunodialog.hxx diff --git a/svtools/inc/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx similarity index 100% rename from svtools/inc/svtools/grfmgr.hxx rename to include/svtools/grfmgr.hxx diff --git a/svtools/inc/svtools/headbar.hxx b/include/svtools/headbar.hxx similarity index 100% rename from svtools/inc/svtools/headbar.hxx rename to include/svtools/headbar.hxx diff --git a/svtools/inc/svtools/helpid.hrc b/include/svtools/helpid.hrc similarity index 100% rename from svtools/inc/svtools/helpid.hrc rename to include/svtools/helpid.hrc diff --git a/svtools/inc/svtools/helpopt.hxx b/include/svtools/helpopt.hxx similarity index 100% rename from svtools/inc/svtools/helpopt.hxx rename to include/svtools/helpopt.hxx diff --git a/svtools/inc/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx similarity index 100% rename from svtools/inc/svtools/htmlcfg.hxx rename to include/svtools/htmlcfg.hxx diff --git a/svtools/inc/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx similarity index 100% rename from svtools/inc/svtools/htmlkywd.hxx rename to include/svtools/htmlkywd.hxx diff --git a/svtools/inc/svtools/htmlout.hxx b/include/svtools/htmlout.hxx similarity index 100% rename from svtools/inc/svtools/htmlout.hxx rename to include/svtools/htmlout.hxx diff --git a/svtools/inc/svtools/htmltokn.h b/include/svtools/htmltokn.h similarity index 100% rename from svtools/inc/svtools/htmltokn.h rename to include/svtools/htmltokn.h diff --git a/svtools/inc/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx similarity index 100% rename from svtools/inc/svtools/hyperlabel.hxx rename to include/svtools/hyperlabel.hxx diff --git a/svtools/inc/svtools/imagemgr.hrc b/include/svtools/imagemgr.hrc similarity index 100% rename from svtools/inc/svtools/imagemgr.hrc rename to include/svtools/imagemgr.hrc diff --git a/svtools/inc/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx similarity index 100% rename from svtools/inc/svtools/imagemgr.hxx rename to include/svtools/imagemgr.hxx diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx similarity index 100% rename from svtools/inc/svtools/imageresourceaccess.hxx rename to include/svtools/imageresourceaccess.hxx diff --git a/svtools/inc/svtools/imap.hxx b/include/svtools/imap.hxx similarity index 100% rename from svtools/inc/svtools/imap.hxx rename to include/svtools/imap.hxx diff --git a/svtools/inc/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx similarity index 100% rename from svtools/inc/svtools/imapcirc.hxx rename to include/svtools/imapcirc.hxx diff --git a/svtools/inc/svtools/imapobj.hxx b/include/svtools/imapobj.hxx similarity index 100% rename from svtools/inc/svtools/imapobj.hxx rename to include/svtools/imapobj.hxx diff --git a/svtools/inc/svtools/imappoly.hxx b/include/svtools/imappoly.hxx similarity index 100% rename from svtools/inc/svtools/imappoly.hxx rename to include/svtools/imappoly.hxx diff --git a/svtools/inc/svtools/imaprect.hxx b/include/svtools/imaprect.hxx similarity index 100% rename from svtools/inc/svtools/imaprect.hxx rename to include/svtools/imaprect.hxx diff --git a/svtools/inc/svtools/imgdef.hxx b/include/svtools/imgdef.hxx similarity index 100% rename from svtools/inc/svtools/imgdef.hxx rename to include/svtools/imgdef.hxx diff --git a/svtools/inc/svtools/indexentryres.hxx b/include/svtools/indexentryres.hxx similarity index 100% rename from svtools/inc/svtools/indexentryres.hxx rename to include/svtools/indexentryres.hxx diff --git a/svtools/inc/svtools/inetimg.hxx b/include/svtools/inetimg.hxx similarity index 100% rename from svtools/inc/svtools/inetimg.hxx rename to include/svtools/inetimg.hxx diff --git a/svtools/inc/svtools/inettbc.hxx b/include/svtools/inettbc.hxx similarity index 100% rename from svtools/inc/svtools/inettbc.hxx rename to include/svtools/inettbc.hxx diff --git a/svtools/inc/svtools/insdlg.hxx b/include/svtools/insdlg.hxx similarity index 100% rename from svtools/inc/svtools/insdlg.hxx rename to include/svtools/insdlg.hxx diff --git a/svtools/inc/svtools/itemdel.hxx b/include/svtools/itemdel.hxx similarity index 100% rename from svtools/inc/svtools/itemdel.hxx rename to include/svtools/itemdel.hxx diff --git a/svtools/inc/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx similarity index 100% rename from svtools/inc/svtools/ivctrl.hxx rename to include/svtools/ivctrl.hxx diff --git a/svtools/inc/svtools/javacontext.hxx b/include/svtools/javacontext.hxx similarity index 100% rename from svtools/inc/svtools/javacontext.hxx rename to include/svtools/javacontext.hxx diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx similarity index 100% rename from svtools/inc/svtools/javainteractionhandler.hxx rename to include/svtools/javainteractionhandler.hxx diff --git a/svtools/inc/svtools/langhelp.hxx b/include/svtools/langhelp.hxx similarity index 100% rename from svtools/inc/svtools/langhelp.hxx rename to include/svtools/langhelp.hxx diff --git a/svtools/inc/svtools/langtab.hxx b/include/svtools/langtab.hxx similarity index 100% rename from svtools/inc/svtools/langtab.hxx rename to include/svtools/langtab.hxx diff --git a/svtools/inc/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx similarity index 100% rename from svtools/inc/svtools/localresaccess.hxx rename to include/svtools/localresaccess.hxx diff --git a/svtools/inc/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx similarity index 100% rename from svtools/inc/svtools/menuoptions.hxx rename to include/svtools/menuoptions.hxx diff --git a/svtools/inc/svtools/miscopt.hxx b/include/svtools/miscopt.hxx similarity index 100% rename from svtools/inc/svtools/miscopt.hxx rename to include/svtools/miscopt.hxx diff --git a/svtools/inc/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx similarity index 100% rename from svtools/inc/svtools/optionsdrawinglayer.hxx rename to include/svtools/optionsdrawinglayer.hxx diff --git a/svtools/inc/svtools/parhtml.hxx b/include/svtools/parhtml.hxx similarity index 100% rename from svtools/inc/svtools/parhtml.hxx rename to include/svtools/parhtml.hxx diff --git a/svtools/inc/svtools/parrtf.hxx b/include/svtools/parrtf.hxx similarity index 100% rename from svtools/inc/svtools/parrtf.hxx rename to include/svtools/parrtf.hxx diff --git a/svtools/inc/svtools/place.hxx b/include/svtools/place.hxx similarity index 100% rename from svtools/inc/svtools/place.hxx rename to include/svtools/place.hxx diff --git a/svtools/inc/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx similarity index 100% rename from svtools/inc/svtools/popupmenucontrollerbase.hxx rename to include/svtools/popupmenucontrollerbase.hxx diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx similarity index 100% rename from svtools/inc/svtools/popupwindowcontroller.hxx rename to include/svtools/popupwindowcontroller.hxx diff --git a/svtools/inc/svtools/printoptions.hxx b/include/svtools/printoptions.hxx similarity index 100% rename from svtools/inc/svtools/printoptions.hxx rename to include/svtools/printoptions.hxx diff --git a/svtools/inc/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx similarity index 100% rename from svtools/inc/svtools/prnsetup.hxx rename to include/svtools/prnsetup.hxx diff --git a/svtools/inc/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx similarity index 100% rename from svtools/inc/svtools/restartdialog.hxx rename to include/svtools/restartdialog.hxx diff --git a/svtools/inc/svtools/roadmap.hxx b/include/svtools/roadmap.hxx similarity index 100% rename from svtools/inc/svtools/roadmap.hxx rename to include/svtools/roadmap.hxx diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx similarity index 100% rename from svtools/inc/svtools/roadmapwizard.hxx rename to include/svtools/roadmapwizard.hxx diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx similarity index 100% rename from svtools/inc/svtools/rtfkeywd.hxx rename to include/svtools/rtfkeywd.hxx diff --git a/svtools/inc/svtools/rtfout.hxx b/include/svtools/rtfout.hxx similarity index 100% rename from svtools/inc/svtools/rtfout.hxx rename to include/svtools/rtfout.hxx diff --git a/svtools/inc/svtools/rtftoken.h b/include/svtools/rtftoken.h similarity index 100% rename from svtools/inc/svtools/rtftoken.h rename to include/svtools/rtftoken.h diff --git a/svtools/inc/svtools/ruler.hxx b/include/svtools/ruler.hxx similarity index 100% rename from svtools/inc/svtools/ruler.hxx rename to include/svtools/ruler.hxx diff --git a/svtools/inc/svtools/sampletext.hxx b/include/svtools/sampletext.hxx similarity index 100% rename from svtools/inc/svtools/sampletext.hxx rename to include/svtools/sampletext.hxx diff --git a/svtools/inc/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx similarity index 100% rename from svtools/inc/svtools/scriptedtext.hxx rename to include/svtools/scriptedtext.hxx diff --git a/svtools/inc/svtools/scrwin.hxx b/include/svtools/scrwin.hxx similarity index 100% rename from svtools/inc/svtools/scrwin.hxx rename to include/svtools/scrwin.hxx diff --git a/svtools/inc/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx similarity index 100% rename from svtools/inc/svtools/sfxecode.hxx rename to include/svtools/sfxecode.hxx diff --git a/svtools/inc/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx similarity index 100% rename from svtools/inc/svtools/slidesorterbaropt.hxx rename to include/svtools/slidesorterbaropt.hxx diff --git a/svtools/inc/svtools/soerr.hxx b/include/svtools/soerr.hxx similarity index 100% rename from svtools/inc/svtools/soerr.hxx rename to include/svtools/soerr.hxx diff --git a/svtools/inc/svtools/sores.hxx b/include/svtools/sores.hxx similarity index 100% rename from svtools/inc/svtools/sores.hxx rename to include/svtools/sores.hxx diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx similarity index 100% rename from svtools/inc/svtools/statusbarcontroller.hxx rename to include/svtools/statusbarcontroller.hxx diff --git a/svtools/inc/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx similarity index 100% rename from svtools/inc/svtools/stdctrl.hxx rename to include/svtools/stdctrl.hxx diff --git a/svtools/inc/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx similarity index 100% rename from svtools/inc/svtools/stdmenu.hxx rename to include/svtools/stdmenu.hxx diff --git a/svtools/inc/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx similarity index 100% rename from svtools/inc/svtools/stringtransfer.hxx rename to include/svtools/stringtransfer.hxx diff --git a/svtools/inc/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx similarity index 100% rename from svtools/inc/svtools/svlbitm.hxx rename to include/svtools/svlbitm.hxx diff --git a/svtools/inc/svtools/svmedit.hxx b/include/svtools/svmedit.hxx similarity index 100% rename from svtools/inc/svtools/svmedit.hxx rename to include/svtools/svmedit.hxx diff --git a/svtools/inc/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx similarity index 100% rename from svtools/inc/svtools/svmedit2.hxx rename to include/svtools/svmedit2.hxx diff --git a/svtools/inc/svtools/svparser.hxx b/include/svtools/svparser.hxx similarity index 100% rename from svtools/inc/svtools/svparser.hxx rename to include/svtools/svparser.hxx diff --git a/svtools/inc/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx similarity index 100% rename from svtools/inc/svtools/svtabbx.hxx rename to include/svtools/svtabbx.hxx diff --git a/svtools/inc/svtools/svtdllapi.h b/include/svtools/svtdllapi.h similarity index 100% rename from svtools/inc/svtools/svtdllapi.h rename to include/svtools/svtdllapi.h diff --git a/svtools/inc/svtools/svtools.hrc b/include/svtools/svtools.hrc similarity index 100% rename from svtools/inc/svtools/svtools.hrc rename to include/svtools/svtools.hrc diff --git a/svtools/inc/svtools/svtresid.hxx b/include/svtools/svtresid.hxx similarity index 100% rename from svtools/inc/svtools/svtresid.hxx rename to include/svtools/svtresid.hxx diff --git a/svtools/inc/svtools/svxbox.hxx b/include/svtools/svxbox.hxx similarity index 100% rename from svtools/inc/svtools/svxbox.hxx rename to include/svtools/svxbox.hxx diff --git a/svtools/inc/svtools/tabbar.hxx b/include/svtools/tabbar.hxx similarity index 100% rename from svtools/inc/svtools/tabbar.hxx rename to include/svtools/tabbar.hxx diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/include/svtools/table/defaultinputhandler.hxx similarity index 100% rename from svtools/inc/svtools/table/defaultinputhandler.hxx rename to include/svtools/table/defaultinputhandler.hxx diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/include/svtools/table/gridtablerenderer.hxx similarity index 100% rename from svtools/inc/svtools/table/gridtablerenderer.hxx rename to include/svtools/table/gridtablerenderer.hxx diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/include/svtools/table/tablecontrol.hxx similarity index 100% rename from svtools/inc/svtools/table/tablecontrol.hxx rename to include/svtools/table/tablecontrol.hxx diff --git a/svtools/inc/svtools/table/tablecontrolinterface.hxx b/include/svtools/table/tablecontrolinterface.hxx similarity index 100% rename from svtools/inc/svtools/table/tablecontrolinterface.hxx rename to include/svtools/table/tablecontrolinterface.hxx diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/include/svtools/table/tableinputhandler.hxx similarity index 100% rename from svtools/inc/svtools/table/tableinputhandler.hxx rename to include/svtools/table/tableinputhandler.hxx diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/include/svtools/table/tablemodel.hxx similarity index 100% rename from svtools/inc/svtools/table/tablemodel.hxx rename to include/svtools/table/tablemodel.hxx diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx similarity index 100% rename from svtools/inc/svtools/table/tablerenderer.hxx rename to include/svtools/table/tablerenderer.hxx diff --git a/svtools/inc/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx similarity index 100% rename from svtools/inc/svtools/table/tablesort.hxx rename to include/svtools/table/tablesort.hxx diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx similarity index 100% rename from svtools/inc/svtools/table/tabletypes.hxx rename to include/svtools/table/tabletypes.hxx diff --git a/svtools/inc/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx similarity index 100% rename from svtools/inc/svtools/templatefoldercache.hxx rename to include/svtools/templatefoldercache.hxx diff --git a/svtools/inc/svtools/templdlg.hxx b/include/svtools/templdlg.hxx similarity index 100% rename from svtools/inc/svtools/templdlg.hxx rename to include/svtools/templdlg.hxx diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/include/svtools/textwindowpeer.hxx similarity index 100% rename from svtools/inc/svtools/textwindowpeer.hxx rename to include/svtools/textwindowpeer.hxx diff --git a/svtools/inc/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx similarity index 100% rename from svtools/inc/svtools/toolbarmenu.hxx rename to include/svtools/toolbarmenu.hxx diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx similarity index 100% rename from svtools/inc/svtools/toolboxcontroller.hxx rename to include/svtools/toolboxcontroller.hxx diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/include/svtools/toolpanel/decklayouter.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/decklayouter.hxx rename to include/svtools/toolpanel/decklayouter.hxx diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/drawerlayouter.hxx rename to include/svtools/toolpanel/drawerlayouter.hxx diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/paneltabbar.hxx rename to include/svtools/toolpanel/paneltabbar.hxx diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/include/svtools/toolpanel/refbase.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/refbase.hxx rename to include/svtools/toolpanel/refbase.hxx diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/include/svtools/toolpanel/tabalignment.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/tabalignment.hxx rename to include/svtools/toolpanel/tabalignment.hxx diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/include/svtools/toolpanel/tabitemcontent.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/tabitemcontent.hxx rename to include/svtools/toolpanel/tabitemcontent.hxx diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/tablayouter.hxx rename to include/svtools/toolpanel/tablayouter.hxx diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/toolpanel.hxx rename to include/svtools/toolpanel/toolpanel.hxx diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx similarity index 100% rename from svtools/inc/svtools/toolpanel/toolpaneldeck.hxx rename to include/svtools/toolpanel/toolpaneldeck.hxx diff --git a/svtools/inc/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx similarity index 100% rename from svtools/inc/svtools/toolpanelopt.hxx rename to include/svtools/toolpanelopt.hxx diff --git a/svtools/inc/svtools/transfer.hxx b/include/svtools/transfer.hxx similarity index 100% rename from svtools/inc/svtools/transfer.hxx rename to include/svtools/transfer.hxx diff --git a/svtools/inc/svtools/treelist.hxx b/include/svtools/treelist.hxx similarity index 100% rename from svtools/inc/svtools/treelist.hxx rename to include/svtools/treelist.hxx diff --git a/svtools/inc/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx similarity index 100% rename from svtools/inc/svtools/treelistbox.hxx rename to include/svtools/treelistbox.hxx diff --git a/svtools/inc/svtools/treelistentries.hxx b/include/svtools/treelistentries.hxx similarity index 100% rename from svtools/inc/svtools/treelistentries.hxx rename to include/svtools/treelistentries.hxx diff --git a/svtools/inc/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx similarity index 100% rename from svtools/inc/svtools/treelistentry.hxx rename to include/svtools/treelistentry.hxx diff --git a/svtools/inc/svtools/unitconv.hxx b/include/svtools/unitconv.hxx similarity index 100% rename from svtools/inc/svtools/unitconv.hxx rename to include/svtools/unitconv.hxx diff --git a/svtools/inc/svtools/unoevent.hxx b/include/svtools/unoevent.hxx similarity index 100% rename from svtools/inc/svtools/unoevent.hxx rename to include/svtools/unoevent.hxx diff --git a/svtools/inc/svtools/unoimap.hxx b/include/svtools/unoimap.hxx similarity index 100% rename from svtools/inc/svtools/unoimap.hxx rename to include/svtools/unoimap.hxx diff --git a/svtools/inc/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx similarity index 100% rename from svtools/inc/svtools/urlcontrol.hxx rename to include/svtools/urlcontrol.hxx diff --git a/svtools/inc/svtools/valueset.hxx b/include/svtools/valueset.hxx similarity index 100% rename from svtools/inc/svtools/valueset.hxx rename to include/svtools/valueset.hxx diff --git a/svtools/inc/svtools/viewdataentry.hxx b/include/svtools/viewdataentry.hxx similarity index 100% rename from svtools/inc/svtools/viewdataentry.hxx rename to include/svtools/viewdataentry.hxx diff --git a/svtools/inc/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx similarity index 100% rename from svtools/inc/svtools/wizardmachine.hxx rename to include/svtools/wizardmachine.hxx diff --git a/svtools/inc/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx similarity index 100% rename from svtools/inc/svtools/wizdlg.hxx rename to include/svtools/wizdlg.hxx diff --git a/svtools/inc/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx similarity index 100% rename from svtools/inc/svtools/xwindowitem.hxx rename to include/svtools/xwindowitem.hxx diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx similarity index 100% rename from svx/inc/svx/AccessibleControlShape.hxx rename to include/svx/AccessibleControlShape.hxx diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx similarity index 100% rename from svx/inc/svx/AccessibleGraphicShape.hxx rename to include/svx/AccessibleGraphicShape.hxx diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx similarity index 100% rename from svx/inc/svx/AccessibleOLEShape.hxx rename to include/svx/AccessibleOLEShape.hxx diff --git a/svx/inc/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx similarity index 100% rename from svx/inc/svx/AccessibleShape.hxx rename to include/svx/AccessibleShape.hxx diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx similarity index 100% rename from svx/inc/svx/AccessibleShapeInfo.hxx rename to include/svx/AccessibleShapeInfo.hxx diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx similarity index 100% rename from svx/inc/svx/AccessibleShapeTreeInfo.hxx rename to include/svx/AccessibleShapeTreeInfo.hxx diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx similarity index 100% rename from svx/inc/svx/AccessibleTableShape.hxx rename to include/svx/AccessibleTableShape.hxx diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx similarity index 100% rename from svx/inc/svx/AccessibleTextHelper.hxx rename to include/svx/AccessibleTextHelper.hxx diff --git a/svx/inc/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx similarity index 100% rename from svx/inc/svx/ActionDescriptionProvider.hxx rename to include/svx/ActionDescriptionProvider.hxx diff --git a/svx/inc/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx similarity index 100% rename from svx/inc/svx/ChildrenManager.hxx rename to include/svx/ChildrenManager.hxx diff --git a/svx/inc/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx similarity index 100% rename from svx/inc/svx/DescriptionGenerator.hxx rename to include/svx/DescriptionGenerator.hxx diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx similarity index 100% rename from svx/inc/svx/EnhancedCustomShape2d.hxx rename to include/svx/EnhancedCustomShape2d.hxx diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx similarity index 100% rename from svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx rename to include/svx/EnhancedCustomShapeFunctionParser.hxx diff --git a/svx/inc/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx similarity index 100% rename from svx/inc/svx/EnhancedCustomShapeGeometry.hxx rename to include/svx/EnhancedCustomShapeGeometry.hxx diff --git a/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx similarity index 100% rename from svx/inc/svx/EnhancedCustomShapeTypeNames.hxx rename to include/svx/EnhancedCustomShapeTypeNames.hxx diff --git a/svx/inc/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx similarity index 100% rename from svx/inc/svx/IAccessibleParent.hxx rename to include/svx/IAccessibleParent.hxx diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx similarity index 100% rename from svx/inc/svx/IAccessibleViewForwarder.hxx rename to include/svx/IAccessibleViewForwarder.hxx diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx similarity index 100% rename from svx/inc/svx/IAccessibleViewForwarderListener.hxx rename to include/svx/IAccessibleViewForwarderListener.hxx diff --git a/svx/inc/svx/ParseContext.hxx b/include/svx/ParseContext.hxx similarity index 100% rename from svx/inc/svx/ParseContext.hxx rename to include/svx/ParseContext.hxx diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx similarity index 100% rename from svx/inc/svx/ShapeTypeHandler.hxx rename to include/svx/ShapeTypeHandler.hxx diff --git a/svx/inc/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx similarity index 100% rename from svx/inc/svx/SmartTagCtl.hxx rename to include/svx/SmartTagCtl.hxx diff --git a/svx/inc/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx similarity index 100% rename from svx/inc/svx/SmartTagItem.hxx rename to include/svx/SmartTagItem.hxx diff --git a/svx/inc/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx similarity index 100% rename from svx/inc/svx/SmartTagMgr.hxx rename to include/svx/SmartTagMgr.hxx diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx similarity index 100% rename from svx/inc/svx/SpellDialogChildWindow.hxx rename to include/svx/SpellDialogChildWindow.hxx diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx similarity index 100% rename from svx/inc/svx/SvxShapeTypes.hxx rename to include/svx/SvxShapeTypes.hxx diff --git a/svx/inc/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx similarity index 100% rename from svx/inc/svx/UnoNamespaceMap.hxx rename to include/svx/UnoNamespaceMap.hxx diff --git a/svx/inc/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx similarity index 100% rename from svx/inc/svx/XPropertyTable.hxx rename to include/svx/XPropertyTable.hxx diff --git a/svx/inc/svx/algitem.hxx b/include/svx/algitem.hxx similarity index 100% rename from svx/inc/svx/algitem.hxx rename to include/svx/algitem.hxx diff --git a/svx/inc/svx/anchorid.hxx b/include/svx/anchorid.hxx similarity index 100% rename from svx/inc/svx/anchorid.hxx rename to include/svx/anchorid.hxx diff --git a/svx/inc/svx/bmpmask.hxx b/include/svx/bmpmask.hxx similarity index 100% rename from svx/inc/svx/bmpmask.hxx rename to include/svx/bmpmask.hxx diff --git a/svx/inc/svx/camera3d.hxx b/include/svx/camera3d.hxx similarity index 100% rename from svx/inc/svx/camera3d.hxx rename to include/svx/camera3d.hxx diff --git a/svx/inc/svx/charmap.hxx b/include/svx/charmap.hxx similarity index 100% rename from svx/inc/svx/charmap.hxx rename to include/svx/charmap.hxx diff --git a/svx/inc/svx/charthelper.hxx b/include/svx/charthelper.hxx similarity index 100% rename from svx/inc/svx/charthelper.hxx rename to include/svx/charthelper.hxx diff --git a/svx/inc/svx/checklbx.hxx b/include/svx/checklbx.hxx similarity index 100% rename from svx/inc/svx/checklbx.hxx rename to include/svx/checklbx.hxx diff --git a/svx/inc/svx/chrtitem.hxx b/include/svx/chrtitem.hxx similarity index 100% rename from svx/inc/svx/chrtitem.hxx rename to include/svx/chrtitem.hxx diff --git a/svx/inc/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx similarity index 100% rename from svx/inc/svx/clipboardctl.hxx rename to include/svx/clipboardctl.hxx diff --git a/svx/inc/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx similarity index 100% rename from svx/inc/svx/clipfmtitem.hxx rename to include/svx/clipfmtitem.hxx diff --git a/svx/inc/svx/colrctrl.hxx b/include/svx/colrctrl.hxx similarity index 100% rename from svx/inc/svx/colrctrl.hxx rename to include/svx/colrctrl.hxx diff --git a/svx/inc/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx similarity index 100% rename from svx/inc/svx/compressgraphicdialog.hxx rename to include/svx/compressgraphicdialog.hxx diff --git a/svx/inc/svx/connctrl.hxx b/include/svx/connctrl.hxx similarity index 100% rename from svx/inc/svx/connctrl.hxx rename to include/svx/connctrl.hxx diff --git a/svx/inc/svx/contdlg.hxx b/include/svx/contdlg.hxx similarity index 100% rename from svx/inc/svx/contdlg.hxx rename to include/svx/contdlg.hxx diff --git a/svx/inc/svx/ctredlin.hxx b/include/svx/ctredlin.hxx similarity index 100% rename from svx/inc/svx/ctredlin.hxx rename to include/svx/ctredlin.hxx diff --git a/svx/inc/svx/cube3d.hxx b/include/svx/cube3d.hxx similarity index 100% rename from svx/inc/svx/cube3d.hxx rename to include/svx/cube3d.hxx diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx similarity index 100% rename from svx/inc/svx/dataaccessdescriptor.hxx rename to include/svx/dataaccessdescriptor.hxx diff --git a/svx/inc/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx similarity index 100% rename from svx/inc/svx/databaselocationinput.hxx rename to include/svx/databaselocationinput.hxx diff --git a/svx/inc/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx similarity index 100% rename from svx/inc/svx/databaseregistrationui.hxx rename to include/svx/databaseregistrationui.hxx diff --git a/svx/inc/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx similarity index 100% rename from svx/inc/svx/dbaexchange.hxx rename to include/svx/dbaexchange.hxx diff --git a/svx/inc/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx similarity index 100% rename from svx/inc/svx/dbaobjectex.hxx rename to include/svx/dbaobjectex.hxx diff --git a/svx/inc/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx similarity index 100% rename from svx/inc/svx/dbcharsethelper.hxx rename to include/svx/dbcharsethelper.hxx diff --git a/svx/inc/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx similarity index 100% rename from svx/inc/svx/dbtoolsclient.hxx rename to include/svx/dbtoolsclient.hxx diff --git a/svx/inc/svx/def3d.hxx b/include/svx/def3d.hxx similarity index 100% rename from svx/inc/svx/def3d.hxx rename to include/svx/def3d.hxx diff --git a/svx/inc/svx/deflt3d.hxx b/include/svx/deflt3d.hxx similarity index 100% rename from svx/inc/svx/deflt3d.hxx rename to include/svx/deflt3d.hxx diff --git a/svx/inc/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx similarity index 100% rename from svx/inc/svx/dialcontrol.hxx rename to include/svx/dialcontrol.hxx diff --git a/svx/inc/svx/dialmgr.hxx b/include/svx/dialmgr.hxx similarity index 100% rename from svx/inc/svx/dialmgr.hxx rename to include/svx/dialmgr.hxx diff --git a/svx/inc/svx/dialogs.hrc b/include/svx/dialogs.hrc similarity index 100% rename from svx/inc/svx/dialogs.hrc rename to include/svx/dialogs.hrc diff --git a/svx/inc/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx similarity index 100% rename from svx/inc/svx/dlgctl3d.hxx rename to include/svx/dlgctl3d.hxx diff --git a/svx/inc/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx similarity index 100% rename from svx/inc/svx/dlgctrl.hxx rename to include/svx/dlgctrl.hxx diff --git a/svx/inc/svx/dlgutil.hxx b/include/svx/dlgutil.hxx similarity index 100% rename from svx/inc/svx/dlgutil.hxx rename to include/svx/dlgutil.hxx diff --git a/svx/inc/svx/drawitem.hxx b/include/svx/drawitem.hxx similarity index 100% rename from svx/inc/svx/drawitem.hxx rename to include/svx/drawitem.hxx diff --git a/svx/inc/svx/dstribut_enum.hxx b/include/svx/dstribut_enum.hxx similarity index 100% rename from svx/inc/svx/dstribut_enum.hxx rename to include/svx/dstribut_enum.hxx diff --git a/svx/inc/svx/e3ditem.hxx b/include/svx/e3ditem.hxx similarity index 100% rename from svx/inc/svx/e3ditem.hxx rename to include/svx/e3ditem.hxx diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx similarity index 100% rename from svx/inc/svx/e3dsceneupdater.hxx rename to include/svx/e3dsceneupdater.hxx diff --git a/svx/inc/svx/e3dundo.hxx b/include/svx/e3dundo.hxx similarity index 100% rename from svx/inc/svx/e3dundo.hxx rename to include/svx/e3dundo.hxx diff --git a/svx/inc/svx/extedit.hxx b/include/svx/extedit.hxx similarity index 100% rename from svx/inc/svx/extedit.hxx rename to include/svx/extedit.hxx diff --git a/svx/inc/svx/exthelpid.hrc b/include/svx/exthelpid.hrc similarity index 100% rename from svx/inc/svx/exthelpid.hrc rename to include/svx/exthelpid.hrc diff --git a/svx/inc/svx/extrud3d.hxx b/include/svx/extrud3d.hxx similarity index 100% rename from svx/inc/svx/extrud3d.hxx rename to include/svx/extrud3d.hxx diff --git a/svx/inc/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx similarity index 100% rename from svx/inc/svx/extrusionbar.hxx rename to include/svx/extrusionbar.hxx diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/include/svx/extrusioncolorcontrol.hxx similarity index 100% rename from svx/inc/svx/extrusioncolorcontrol.hxx rename to include/svx/extrusioncolorcontrol.hxx diff --git a/svx/inc/svx/f3dchild.hxx b/include/svx/f3dchild.hxx similarity index 100% rename from svx/inc/svx/f3dchild.hxx rename to include/svx/f3dchild.hxx diff --git a/svx/inc/svx/fillctrl.hxx b/include/svx/fillctrl.hxx similarity index 100% rename from svx/inc/svx/fillctrl.hxx rename to include/svx/fillctrl.hxx diff --git a/svx/inc/svx/flagsdef.hxx b/include/svx/flagsdef.hxx similarity index 100% rename from svx/inc/svx/flagsdef.hxx rename to include/svx/flagsdef.hxx diff --git a/svx/inc/svx/float3d.hxx b/include/svx/float3d.hxx similarity index 100% rename from svx/inc/svx/float3d.hxx rename to include/svx/float3d.hxx diff --git a/svx/inc/svx/fmdmod.hxx b/include/svx/fmdmod.hxx similarity index 100% rename from svx/inc/svx/fmdmod.hxx rename to include/svx/fmdmod.hxx diff --git a/svx/inc/svx/fmdpage.hxx b/include/svx/fmdpage.hxx similarity index 100% rename from svx/inc/svx/fmdpage.hxx rename to include/svx/fmdpage.hxx diff --git a/svx/inc/svx/fmglob.hxx b/include/svx/fmglob.hxx similarity index 100% rename from svx/inc/svx/fmglob.hxx rename to include/svx/fmglob.hxx diff --git a/svx/inc/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx similarity index 100% rename from svx/inc/svx/fmgridcl.hxx rename to include/svx/fmgridcl.hxx diff --git a/svx/inc/svx/fmgridif.hxx b/include/svx/fmgridif.hxx similarity index 100% rename from svx/inc/svx/fmgridif.hxx rename to include/svx/fmgridif.hxx diff --git a/svx/inc/svx/fmmodel.hxx b/include/svx/fmmodel.hxx similarity index 100% rename from svx/inc/svx/fmmodel.hxx rename to include/svx/fmmodel.hxx diff --git a/svx/inc/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx similarity index 100% rename from svx/inc/svx/fmobjfac.hxx rename to include/svx/fmobjfac.hxx diff --git a/svx/inc/svx/fmpage.hxx b/include/svx/fmpage.hxx similarity index 100% rename from svx/inc/svx/fmpage.hxx rename to include/svx/fmpage.hxx diff --git a/svx/inc/svx/fmresids.hrc b/include/svx/fmresids.hrc similarity index 100% rename from svx/inc/svx/fmresids.hrc rename to include/svx/fmresids.hrc diff --git a/svx/inc/svx/fmsearch.hxx b/include/svx/fmsearch.hxx similarity index 100% rename from svx/inc/svx/fmsearch.hxx rename to include/svx/fmsearch.hxx diff --git a/svx/inc/svx/fmshell.hxx b/include/svx/fmshell.hxx similarity index 100% rename from svx/inc/svx/fmshell.hxx rename to include/svx/fmshell.hxx diff --git a/svx/inc/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx similarity index 100% rename from svx/inc/svx/fmsrccfg.hxx rename to include/svx/fmsrccfg.hxx diff --git a/svx/inc/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx similarity index 100% rename from svx/inc/svx/fmsrcimp.hxx rename to include/svx/fmsrcimp.hxx diff --git a/svx/inc/svx/fmtools.hxx b/include/svx/fmtools.hxx similarity index 100% rename from svx/inc/svx/fmtools.hxx rename to include/svx/fmtools.hxx diff --git a/svx/inc/svx/fmview.hxx b/include/svx/fmview.hxx similarity index 100% rename from svx/inc/svx/fmview.hxx rename to include/svx/fmview.hxx diff --git a/svx/inc/svx/fntctl.hxx b/include/svx/fntctl.hxx similarity index 100% rename from svx/inc/svx/fntctl.hxx rename to include/svx/fntctl.hxx diff --git a/svx/inc/svx/fntctrl.hxx b/include/svx/fntctrl.hxx similarity index 100% rename from svx/inc/svx/fntctrl.hxx rename to include/svx/fntctrl.hxx diff --git a/svx/inc/svx/fntszctl.hxx b/include/svx/fntszctl.hxx similarity index 100% rename from svx/inc/svx/fntszctl.hxx rename to include/svx/fntszctl.hxx diff --git a/svx/inc/svx/fontlb.hxx b/include/svx/fontlb.hxx similarity index 100% rename from svx/inc/svx/fontlb.hxx rename to include/svx/fontlb.hxx diff --git a/svx/inc/svx/fontwork.hxx b/include/svx/fontwork.hxx similarity index 100% rename from svx/inc/svx/fontwork.hxx rename to include/svx/fontwork.hxx diff --git a/svx/inc/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx similarity index 100% rename from svx/inc/svx/fontworkbar.hxx rename to include/svx/fontworkbar.hxx diff --git a/svx/inc/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx similarity index 100% rename from svx/inc/svx/fontworkgallery.hxx rename to include/svx/fontworkgallery.hxx diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx similarity index 100% rename from svx/inc/svx/formatpaintbrushctrl.hxx rename to include/svx/formatpaintbrushctrl.hxx diff --git a/svx/inc/svx/framebordertype.hxx b/include/svx/framebordertype.hxx similarity index 100% rename from svx/inc/svx/framebordertype.hxx rename to include/svx/framebordertype.hxx diff --git a/svx/inc/svx/framelink.hxx b/include/svx/framelink.hxx similarity index 100% rename from svx/inc/svx/framelink.hxx rename to include/svx/framelink.hxx diff --git a/svx/inc/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx similarity index 100% rename from svx/inc/svx/framelinkarray.hxx rename to include/svx/framelinkarray.hxx diff --git a/svx/inc/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx similarity index 100% rename from svx/inc/svx/frmdirlbox.hxx rename to include/svx/frmdirlbox.hxx diff --git a/svx/inc/svx/frmsel.hxx b/include/svx/frmsel.hxx similarity index 100% rename from svx/inc/svx/frmsel.hxx rename to include/svx/frmsel.hxx diff --git a/svx/inc/svx/galbrws.hxx b/include/svx/galbrws.hxx similarity index 100% rename from svx/inc/svx/galbrws.hxx rename to include/svx/galbrws.hxx diff --git a/svx/inc/svx/galctrl.hxx b/include/svx/galctrl.hxx similarity index 100% rename from svx/inc/svx/galctrl.hxx rename to include/svx/galctrl.hxx diff --git a/svx/inc/svx/gallery.hxx b/include/svx/gallery.hxx similarity index 100% rename from svx/inc/svx/gallery.hxx rename to include/svx/gallery.hxx diff --git a/svx/inc/svx/gallery1.hxx b/include/svx/gallery1.hxx similarity index 100% rename from svx/inc/svx/gallery1.hxx rename to include/svx/gallery1.hxx diff --git a/svx/inc/svx/galmisc.hxx b/include/svx/galmisc.hxx similarity index 100% rename from svx/inc/svx/galmisc.hxx rename to include/svx/galmisc.hxx diff --git a/svx/inc/svx/galtheme.hxx b/include/svx/galtheme.hxx similarity index 100% rename from svx/inc/svx/galtheme.hxx rename to include/svx/galtheme.hxx diff --git a/svx/inc/svx/globl3d.hxx b/include/svx/globl3d.hxx similarity index 100% rename from svx/inc/svx/globl3d.hxx rename to include/svx/globl3d.hxx diff --git a/svx/inc/svx/grafctrl.hxx b/include/svx/grafctrl.hxx similarity index 100% rename from svx/inc/svx/grafctrl.hxx rename to include/svx/grafctrl.hxx diff --git a/svx/inc/svx/graphctl.hxx b/include/svx/graphctl.hxx similarity index 100% rename from svx/inc/svx/graphctl.hxx rename to include/svx/graphctl.hxx diff --git a/svx/inc/svx/graphichelper.hxx b/include/svx/graphichelper.hxx similarity index 100% rename from svx/inc/svx/graphichelper.hxx rename to include/svx/graphichelper.hxx diff --git a/svx/inc/svx/grfcrop.hxx b/include/svx/grfcrop.hxx similarity index 100% rename from svx/inc/svx/grfcrop.hxx rename to include/svx/grfcrop.hxx diff --git a/svx/inc/svx/grfflt.hxx b/include/svx/grfflt.hxx similarity index 100% rename from svx/inc/svx/grfflt.hxx rename to include/svx/grfflt.hxx diff --git a/svx/inc/svx/gridctrl.hxx b/include/svx/gridctrl.hxx similarity index 100% rename from svx/inc/svx/gridctrl.hxx rename to include/svx/gridctrl.hxx diff --git a/svx/inc/svx/hdft.hxx b/include/svx/hdft.hxx similarity index 100% rename from svx/inc/svx/hdft.hxx rename to include/svx/hdft.hxx diff --git a/svx/inc/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx similarity index 100% rename from svx/inc/svx/helperhittest3d.hxx rename to include/svx/helperhittest3d.hxx diff --git a/svx/inc/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx similarity index 100% rename from svx/inc/svx/hlnkitem.hxx rename to include/svx/hlnkitem.hxx diff --git a/svx/inc/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx similarity index 100% rename from svx/inc/svx/hyperdlg.hxx rename to include/svx/hyperdlg.hxx diff --git a/svx/inc/svx/ifaceids.hxx b/include/svx/ifaceids.hxx similarity index 100% rename from svx/inc/svx/ifaceids.hxx rename to include/svx/ifaceids.hxx diff --git a/svx/inc/svx/imapdlg.hxx b/include/svx/imapdlg.hxx similarity index 100% rename from svx/inc/svx/imapdlg.hxx rename to include/svx/imapdlg.hxx diff --git a/svx/inc/svx/insctrl.hxx b/include/svx/insctrl.hxx similarity index 100% rename from svx/inc/svx/insctrl.hxx rename to include/svx/insctrl.hxx diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx similarity index 100% rename from svx/inc/svx/ipolypolygoneditorcontroller.hxx rename to include/svx/ipolypolygoneditorcontroller.hxx diff --git a/svx/inc/svx/itemwin.hxx b/include/svx/itemwin.hxx similarity index 100% rename from svx/inc/svx/itemwin.hxx rename to include/svx/itemwin.hxx diff --git a/svx/inc/svx/itextprovider.hxx b/include/svx/itextprovider.hxx similarity index 100% rename from svx/inc/svx/itextprovider.hxx rename to include/svx/itextprovider.hxx diff --git a/svx/inc/svx/langbox.hxx b/include/svx/langbox.hxx similarity index 100% rename from svx/inc/svx/langbox.hxx rename to include/svx/langbox.hxx diff --git a/svx/inc/svx/lathe3d.hxx b/include/svx/lathe3d.hxx similarity index 100% rename from svx/inc/svx/lathe3d.hxx rename to include/svx/lathe3d.hxx diff --git a/svx/inc/svx/layctrl.hxx b/include/svx/layctrl.hxx similarity index 100% rename from svx/inc/svx/layctrl.hxx rename to include/svx/layctrl.hxx diff --git a/svx/inc/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx similarity index 100% rename from svx/inc/svx/lboxctrl.hxx rename to include/svx/lboxctrl.hxx diff --git a/svx/inc/svx/linectrl.hxx b/include/svx/linectrl.hxx similarity index 100% rename from svx/inc/svx/linectrl.hxx rename to include/svx/linectrl.hxx diff --git a/svx/inc/svx/linkwarn.hxx b/include/svx/linkwarn.hxx similarity index 100% rename from svx/inc/svx/linkwarn.hxx rename to include/svx/linkwarn.hxx diff --git a/svx/inc/svx/measctrl.hxx b/include/svx/measctrl.hxx similarity index 100% rename from svx/inc/svx/measctrl.hxx rename to include/svx/measctrl.hxx diff --git a/svx/inc/svx/modctrl.hxx b/include/svx/modctrl.hxx similarity index 100% rename from svx/inc/svx/modctrl.hxx rename to include/svx/modctrl.hxx diff --git a/svx/inc/svx/msdffdef.hxx b/include/svx/msdffdef.hxx similarity index 100% rename from svx/inc/svx/msdffdef.hxx rename to include/svx/msdffdef.hxx diff --git a/svx/inc/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx similarity index 100% rename from svx/inc/svx/numfmtsh.hxx rename to include/svx/numfmtsh.hxx diff --git a/svx/inc/svx/numinf.hxx b/include/svx/numinf.hxx similarity index 100% rename from svx/inc/svx/numinf.hxx rename to include/svx/numinf.hxx diff --git a/svx/inc/svx/numvset.hxx b/include/svx/numvset.hxx similarity index 100% rename from svx/inc/svx/numvset.hxx rename to include/svx/numvset.hxx diff --git a/svx/inc/svx/obj3d.hxx b/include/svx/obj3d.hxx similarity index 100% rename from svx/inc/svx/obj3d.hxx rename to include/svx/obj3d.hxx diff --git a/svx/inc/svx/objfac3d.hxx b/include/svx/objfac3d.hxx similarity index 100% rename from svx/inc/svx/objfac3d.hxx rename to include/svx/objfac3d.hxx diff --git a/svx/inc/svx/ofaitem.hxx b/include/svx/ofaitem.hxx similarity index 100% rename from svx/inc/svx/ofaitem.hxx rename to include/svx/ofaitem.hxx diff --git a/svx/inc/svx/optgenrl.hxx b/include/svx/optgenrl.hxx similarity index 100% rename from svx/inc/svx/optgenrl.hxx rename to include/svx/optgenrl.hxx diff --git a/svx/inc/svx/optgrid.hxx b/include/svx/optgrid.hxx similarity index 100% rename from svx/inc/svx/optgrid.hxx rename to include/svx/optgrid.hxx diff --git a/svx/inc/svx/orienthelper.hxx b/include/svx/orienthelper.hxx similarity index 100% rename from svx/inc/svx/orienthelper.hxx rename to include/svx/orienthelper.hxx diff --git a/svx/inc/svx/pagectrl.hxx b/include/svx/pagectrl.hxx similarity index 100% rename from svx/inc/svx/pagectrl.hxx rename to include/svx/pagectrl.hxx diff --git a/svx/inc/svx/pageitem.hxx b/include/svx/pageitem.hxx similarity index 100% rename from svx/inc/svx/pageitem.hxx rename to include/svx/pageitem.hxx diff --git a/svx/inc/svx/paraprev.hxx b/include/svx/paraprev.hxx similarity index 100% rename from svx/inc/svx/paraprev.hxx rename to include/svx/paraprev.hxx diff --git a/svx/inc/svx/passwd.hxx b/include/svx/passwd.hxx similarity index 100% rename from svx/inc/svx/passwd.hxx rename to include/svx/passwd.hxx diff --git a/svx/inc/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx similarity index 100% rename from svx/inc/svx/pfiledlg.hxx rename to include/svx/pfiledlg.hxx diff --git a/svx/inc/svx/polygn3d.hxx b/include/svx/polygn3d.hxx similarity index 100% rename from svx/inc/svx/polygn3d.hxx rename to include/svx/polygn3d.hxx diff --git a/svx/inc/svx/polypolygoneditor.hxx b/include/svx/polypolygoneditor.hxx similarity index 100% rename from svx/inc/svx/polypolygoneditor.hxx rename to include/svx/polypolygoneditor.hxx diff --git a/svx/inc/svx/polysc3d.hxx b/include/svx/polysc3d.hxx similarity index 100% rename from svx/inc/svx/polysc3d.hxx rename to include/svx/polysc3d.hxx diff --git a/svx/inc/svx/postattr.hxx b/include/svx/postattr.hxx similarity index 100% rename from svx/inc/svx/postattr.hxx rename to include/svx/postattr.hxx diff --git a/svx/inc/svx/prtqry.hxx b/include/svx/prtqry.hxx similarity index 100% rename from svx/inc/svx/prtqry.hxx rename to include/svx/prtqry.hxx diff --git a/svx/inc/svx/pszctrl.hxx b/include/svx/pszctrl.hxx similarity index 100% rename from svx/inc/svx/pszctrl.hxx rename to include/svx/pszctrl.hxx diff --git a/svx/inc/svx/rectenum.hxx b/include/svx/rectenum.hxx similarity index 100% rename from svx/inc/svx/rectenum.hxx rename to include/svx/rectenum.hxx diff --git a/svx/inc/svx/relfld.hxx b/include/svx/relfld.hxx similarity index 100% rename from svx/inc/svx/relfld.hxx rename to include/svx/relfld.hxx diff --git a/svx/inc/svx/rotmodit.hxx b/include/svx/rotmodit.hxx similarity index 100% rename from svx/inc/svx/rotmodit.hxx rename to include/svx/rotmodit.hxx diff --git a/svx/inc/svx/rubydialog.hxx b/include/svx/rubydialog.hxx similarity index 100% rename from svx/inc/svx/rubydialog.hxx rename to include/svx/rubydialog.hxx diff --git a/svx/inc/svx/ruler.hxx b/include/svx/ruler.hxx similarity index 100% rename from svx/inc/svx/ruler.hxx rename to include/svx/ruler.hxx diff --git a/svx/inc/svx/rulritem.hxx b/include/svx/rulritem.hxx similarity index 100% rename from svx/inc/svx/rulritem.hxx rename to include/svx/rulritem.hxx diff --git a/svx/inc/svx/scene3d.hxx b/include/svx/scene3d.hxx similarity index 100% rename from svx/inc/svx/scene3d.hxx rename to include/svx/scene3d.hxx diff --git a/svx/inc/svx/sdangitm.hxx b/include/svx/sdangitm.hxx similarity index 100% rename from svx/inc/svx/sdangitm.hxx rename to include/svx/sdangitm.hxx diff --git a/svx/inc/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx similarity index 100% rename from svx/inc/svx/sdasaitm.hxx rename to include/svx/sdasaitm.hxx diff --git a/svx/inc/svx/sdasitm.hxx b/include/svx/sdasitm.hxx similarity index 100% rename from svx/inc/svx/sdasitm.hxx rename to include/svx/sdasitm.hxx diff --git a/svx/inc/svx/sderitm.hxx b/include/svx/sderitm.hxx similarity index 100% rename from svx/inc/svx/sderitm.hxx rename to include/svx/sderitm.hxx diff --git a/svx/inc/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx similarity index 100% rename from svx/inc/svx/sdgcoitm.hxx rename to include/svx/sdgcoitm.hxx diff --git a/svx/inc/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx similarity index 100% rename from svx/inc/svx/sdgcpitm.hxx rename to include/svx/sdgcpitm.hxx diff --git a/svx/inc/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx similarity index 100% rename from svx/inc/svx/sdggaitm.hxx rename to include/svx/sdggaitm.hxx diff --git a/svx/inc/svx/sdginitm.hxx b/include/svx/sdginitm.hxx similarity index 100% rename from svx/inc/svx/sdginitm.hxx rename to include/svx/sdginitm.hxx diff --git a/svx/inc/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx similarity index 100% rename from svx/inc/svx/sdgluitm.hxx rename to include/svx/sdgluitm.hxx diff --git a/svx/inc/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx similarity index 100% rename from svx/inc/svx/sdgmoitm.hxx rename to include/svx/sdgmoitm.hxx diff --git a/svx/inc/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx similarity index 100% rename from svx/inc/svx/sdgtritm.hxx rename to include/svx/sdgtritm.hxx diff --git a/svx/inc/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx similarity index 100% rename from svx/inc/svx/sdmetitm.hxx rename to include/svx/sdmetitm.hxx diff --git a/svx/inc/svx/sdooitm.hxx b/include/svx/sdooitm.hxx similarity index 100% rename from svx/inc/svx/sdooitm.hxx rename to include/svx/sdooitm.hxx diff --git a/svx/inc/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx similarity index 100% rename from svx/inc/svx/sdprcitm.hxx rename to include/svx/sdprcitm.hxx diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx similarity index 100% rename from svx/inc/svx/sdr/animation/animationstate.hxx rename to include/svx/sdr/animation/animationstate.hxx diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx similarity index 100% rename from svx/inc/svx/sdr/animation/objectanimator.hxx rename to include/svx/sdr/animation/objectanimator.hxx diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx similarity index 100% rename from svx/inc/svx/sdr/animation/scheduler.hxx rename to include/svx/sdr/animation/scheduler.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx rename to include/svx/sdr/attribute/sdrfilltextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx rename to include/svx/sdr/attribute/sdrformtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx rename to include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx rename to include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx rename to include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx rename to include/svx/sdr/attribute/sdrshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx similarity index 100% rename from svx/inc/svx/sdr/attribute/sdrtextattribute.hxx rename to include/svx/sdr/attribute/sdrtextattribute.hxx diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/displayinfo.hxx rename to include/svx/sdr/contact/displayinfo.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/objectcontact.hxx rename to include/svx/sdr/contact/objectcontact.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx rename to include/svx/sdr/contact/objectcontactofobjlistpainter.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/objectcontactofpageview.hxx rename to include/svx/sdr/contact/objectcontactofpageview.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontact.hxx rename to include/svx/sdr/contact/viewcontact.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3d.hxx rename to include/svx/sdr/contact/viewcontactofe3d.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx rename to include/svx/sdr/contact/viewcontactofe3dcube.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx rename to include/svx/sdr/contact/viewcontactofe3dextrude.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx rename to include/svx/sdr/contact/viewcontactofe3dlathe.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx rename to include/svx/sdr/contact/viewcontactofe3dpolygon.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx rename to include/svx/sdr/contact/viewcontactofe3dscene.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx rename to include/svx/sdr/contact/viewcontactofe3dsphere.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx rename to include/svx/sdr/contact/viewcontactofgraphic.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofgroup.hxx rename to include/svx/sdr/contact/viewcontactofgroup.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx rename to include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx rename to include/svx/sdr/contact/viewcontactofpageobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrcircobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx rename to include/svx/sdr/contact/viewcontactofsdredgeobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx rename to include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx rename to include/svx/sdr/contact/viewcontactofsdrole2obj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx rename to include/svx/sdr/contact/viewcontactofsdrpage.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrpathobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx rename to include/svx/sdr/contact/viewcontactofsdrrectobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx rename to include/svx/sdr/contact/viewcontactoftextobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx rename to include/svx/sdr/contact/viewcontactofunocontrol.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx rename to include/svx/sdr/contact/viewcontactofvirtobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontact.hxx rename to include/svx/sdr/contact/viewobjectcontact.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx rename to include/svx/sdr/contact/viewobjectcontactofe3d.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx rename to include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx rename to include/svx/sdr/contact/viewobjectcontactofgraphic.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx rename to include/svx/sdr/contact/viewobjectcontactofgroup.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx rename to include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx rename to include/svx/sdr/contact/viewobjectcontactofpageobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx rename to include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx rename to include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx rename to include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx rename to include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx rename to include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx similarity index 100% rename from svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx rename to include/svx/sdr/contact/viewobjectcontactredirector.hxx diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx similarity index 100% rename from svx/inc/svx/sdr/event/eventhandler.hxx rename to include/svx/sdr/event/eventhandler.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx rename to include/svx/sdr/overlay/overlayanimatedbitmapex.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaybitmapex.hxx rename to include/svx/sdr/overlay/overlaybitmapex.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaycrosshair.hxx rename to include/svx/sdr/overlay/overlaycrosshair.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayhatchrect.hxx rename to include/svx/sdr/overlay/overlayhatchrect.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayhelpline.hxx rename to include/svx/sdr/overlay/overlayhelpline.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayline.hxx rename to include/svx/sdr/overlay/overlayline.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaymanager.hxx rename to include/svx/sdr/overlay/overlaymanager.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx rename to include/svx/sdr/overlay/overlaymanagerbuffered.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayobject.hxx rename to include/svx/sdr/overlay/overlayobject.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayobjectcell.hxx rename to include/svx/sdr/overlay/overlayobjectcell.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayobjectlist.hxx rename to include/svx/sdr/overlay/overlayobjectlist.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx rename to include/svx/sdr/overlay/overlaypolypolygon.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx rename to include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx rename to include/svx/sdr/overlay/overlayrollingrectangle.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlayselection.hxx rename to include/svx/sdr/overlay/overlayselection.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaytools.hxx rename to include/svx/sdr/overlay/overlaytools.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx similarity index 100% rename from svx/inc/svx/sdr/overlay/overlaytriangle.hxx rename to include/svx/sdr/overlay/overlaytriangle.hxx diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/include/svx/sdr/primitive2d/primitiveFactory2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx rename to include/svx/sdr/primitive2d/primitiveFactory2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx rename to include/svx/sdr/primitive2d/sdrattributecreator.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx rename to include/svx/sdr/primitive2d/sdrdecompositiontools.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx rename to include/svx/sdr/primitive2d/sdrole2primitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx rename to include/svx/sdr/primitive2d/sdrprimitivetools.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx rename to include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx rename to 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 similarity index 100% rename from svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx rename to include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx similarity index 100% rename from svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx rename to include/svx/sdr/primitive3d/sdrattributecreator3d.hxx diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/attributeproperties.hxx rename to include/svx/sdr/properties/attributeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/captionproperties.hxx rename to include/svx/sdr/properties/captionproperties.hxx diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/circleproperties.hxx rename to include/svx/sdr/properties/circleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/connectorproperties.hxx rename to include/svx/sdr/properties/connectorproperties.hxx diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/customshapeproperties.hxx rename to include/svx/sdr/properties/customshapeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/defaultproperties.hxx rename to include/svx/sdr/properties/defaultproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx rename to include/svx/sdr/properties/e3dcompoundproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx rename to include/svx/sdr/properties/e3dextrudeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dlatheproperties.hxx rename to include/svx/sdr/properties/e3dlatheproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dproperties.hxx rename to include/svx/sdr/properties/e3dproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dsceneproperties.hxx rename to include/svx/sdr/properties/e3dsceneproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/e3dsphereproperties.hxx rename to include/svx/sdr/properties/e3dsphereproperties.hxx diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/emptyproperties.hxx rename to include/svx/sdr/properties/emptyproperties.hxx diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/graphicproperties.hxx rename to include/svx/sdr/properties/graphicproperties.hxx diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/groupproperties.hxx rename to include/svx/sdr/properties/groupproperties.hxx diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/itemsettools.hxx rename to include/svx/sdr/properties/itemsettools.hxx diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/measureproperties.hxx rename to include/svx/sdr/properties/measureproperties.hxx diff --git a/svx/inc/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/oleproperties.hxx rename to include/svx/sdr/properties/oleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/pageproperties.hxx rename to include/svx/sdr/properties/pageproperties.hxx diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/properties.hxx rename to include/svx/sdr/properties/properties.hxx diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/rectangleproperties.hxx rename to include/svx/sdr/properties/rectangleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx similarity index 100% rename from svx/inc/svx/sdr/properties/textproperties.hxx rename to include/svx/sdr/properties/textproperties.hxx diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx similarity index 100% rename from svx/inc/svx/sdr/table/tabledesign.hxx rename to include/svx/sdr/table/tabledesign.hxx diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx similarity index 100% rename from svx/inc/svx/sdrhittesthelper.hxx rename to include/svx/sdrhittesthelper.hxx diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx similarity index 100% rename from svx/inc/svx/sdrmasterpagedescriptor.hxx rename to include/svx/sdrmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx similarity index 100% rename from svx/inc/svx/sdrobjectfilter.hxx rename to include/svx/sdrobjectfilter.hxx diff --git a/svx/inc/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx similarity index 100% rename from svx/inc/svx/sdrobjectuser.hxx rename to include/svx/sdrobjectuser.hxx diff --git a/svx/inc/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx similarity index 100% rename from svx/inc/svx/sdrpageuser.hxx rename to include/svx/sdrpageuser.hxx diff --git a/svx/inc/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx similarity index 100% rename from svx/inc/svx/sdrpagewindow.hxx rename to include/svx/sdrpagewindow.hxx diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx similarity index 100% rename from svx/inc/svx/sdrpaintwindow.hxx rename to include/svx/sdrpaintwindow.hxx diff --git a/svx/inc/svx/sdshcitm.hxx b/include/svx/sdshcitm.hxx similarity index 100% rename from svx/inc/svx/sdshcitm.hxx rename to include/svx/sdshcitm.hxx diff --git a/svx/inc/svx/sdshitm.hxx b/include/svx/sdshitm.hxx similarity index 100% rename from svx/inc/svx/sdshitm.hxx rename to include/svx/sdshitm.hxx diff --git a/svx/inc/svx/sdshtitm.hxx b/include/svx/sdshtitm.hxx similarity index 100% rename from svx/inc/svx/sdshtitm.hxx rename to include/svx/sdshtitm.hxx diff --git a/svx/inc/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx similarity index 100% rename from svx/inc/svx/sdsxyitm.hxx rename to include/svx/sdsxyitm.hxx diff --git a/svx/inc/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx similarity index 100% rename from svx/inc/svx/sdtaaitm.hxx rename to include/svx/sdtaaitm.hxx diff --git a/svx/inc/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx similarity index 100% rename from svx/inc/svx/sdtacitm.hxx rename to include/svx/sdtacitm.hxx diff --git a/svx/inc/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx similarity index 100% rename from svx/inc/svx/sdtaditm.hxx rename to include/svx/sdtaditm.hxx diff --git a/svx/inc/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx similarity index 100% rename from svx/inc/svx/sdtagitm.hxx rename to include/svx/sdtagitm.hxx diff --git a/svx/inc/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx similarity index 100% rename from svx/inc/svx/sdtaiitm.hxx rename to include/svx/sdtaiitm.hxx diff --git a/svx/inc/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx similarity index 100% rename from svx/inc/svx/sdtaitm.hxx rename to include/svx/sdtaitm.hxx diff --git a/svx/inc/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx similarity index 100% rename from svx/inc/svx/sdtakitm.hxx rename to include/svx/sdtakitm.hxx diff --git a/svx/inc/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx similarity index 100% rename from svx/inc/svx/sdtayitm.hxx rename to include/svx/sdtayitm.hxx diff --git a/svx/inc/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx similarity index 100% rename from svx/inc/svx/sdtcfitm.hxx rename to include/svx/sdtcfitm.hxx diff --git a/svx/inc/svx/sdtditm.hxx b/include/svx/sdtditm.hxx similarity index 100% rename from svx/inc/svx/sdtditm.hxx rename to include/svx/sdtditm.hxx diff --git a/svx/inc/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx similarity index 100% rename from svx/inc/svx/sdtfchim.hxx rename to include/svx/sdtfchim.hxx diff --git a/svx/inc/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx similarity index 100% rename from svx/inc/svx/sdtfsitm.hxx rename to include/svx/sdtfsitm.hxx diff --git a/svx/inc/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx similarity index 100% rename from svx/inc/svx/sdtmfitm.hxx rename to include/svx/sdtmfitm.hxx diff --git a/svx/inc/svx/sdynitm.hxx b/include/svx/sdynitm.hxx similarity index 100% rename from svx/inc/svx/sdynitm.hxx rename to include/svx/sdynitm.hxx diff --git a/svx/inc/svx/selctrl.hxx b/include/svx/selctrl.hxx similarity index 100% rename from svx/inc/svx/selctrl.hxx rename to include/svx/selctrl.hxx diff --git a/svx/inc/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx similarity index 100% rename from svx/inc/svx/selectioncontroller.hxx rename to include/svx/selectioncontroller.hxx diff --git a/svx/inc/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx similarity index 100% rename from svx/inc/svx/shapeproperty.hxx rename to include/svx/shapeproperty.hxx diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx similarity index 100% rename from svx/inc/svx/shapepropertynotifier.hxx rename to include/svx/shapepropertynotifier.hxx diff --git a/svx/inc/svx/simptabl.hxx b/include/svx/simptabl.hxx similarity index 100% rename from svx/inc/svx/simptabl.hxx rename to include/svx/simptabl.hxx diff --git a/svx/inc/svx/sphere3d.hxx b/include/svx/sphere3d.hxx similarity index 100% rename from svx/inc/svx/sphere3d.hxx rename to include/svx/sphere3d.hxx diff --git a/svx/inc/svx/srchdlg.hxx b/include/svx/srchdlg.hxx similarity index 100% rename from svx/inc/svx/srchdlg.hxx rename to include/svx/srchdlg.hxx diff --git a/svx/inc/svx/stddlg.hxx b/include/svx/stddlg.hxx similarity index 100% rename from svx/inc/svx/stddlg.hxx rename to include/svx/stddlg.hxx diff --git a/svx/inc/svx/strarray.hxx b/include/svx/strarray.hxx similarity index 100% rename from svx/inc/svx/strarray.hxx rename to include/svx/strarray.hxx diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx similarity index 100% rename from svx/inc/svx/subtoolboxcontrol.hxx rename to include/svx/subtoolboxcontrol.hxx diff --git a/svx/inc/svx/svdattr.hxx b/include/svx/svdattr.hxx similarity index 100% rename from svx/inc/svx/svdattr.hxx rename to include/svx/svdattr.hxx diff --git a/svx/inc/svx/svdattrx.hxx b/include/svx/svdattrx.hxx similarity index 100% rename from svx/inc/svx/svdattrx.hxx rename to include/svx/svdattrx.hxx diff --git a/svx/inc/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx similarity index 100% rename from svx/inc/svx/svdcrtv.hxx rename to include/svx/svdcrtv.hxx diff --git a/svx/inc/svx/svddef.hxx b/include/svx/svddef.hxx similarity index 100% rename from svx/inc/svx/svddef.hxx rename to include/svx/svddef.hxx diff --git a/svx/inc/svx/svddrag.hxx b/include/svx/svddrag.hxx similarity index 100% rename from svx/inc/svx/svddrag.hxx rename to include/svx/svddrag.hxx diff --git a/svx/inc/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx similarity index 100% rename from svx/inc/svx/svddrgmt.hxx rename to include/svx/svddrgmt.hxx diff --git a/svx/inc/svx/svddrgv.hxx b/include/svx/svddrgv.hxx similarity index 100% rename from svx/inc/svx/svddrgv.hxx rename to include/svx/svddrgv.hxx diff --git a/svx/inc/svx/svdedtv.hxx b/include/svx/svdedtv.hxx similarity index 100% rename from svx/inc/svx/svdedtv.hxx rename to include/svx/svdedtv.hxx diff --git a/svx/inc/svx/svdedxv.hxx b/include/svx/svdedxv.hxx similarity index 100% rename from svx/inc/svx/svdedxv.hxx rename to include/svx/svdedxv.hxx diff --git a/svx/inc/svx/svdetc.hxx b/include/svx/svdetc.hxx similarity index 100% rename from svx/inc/svx/svdetc.hxx rename to include/svx/svdetc.hxx diff --git a/svx/inc/svx/svdfield.hxx b/include/svx/svdfield.hxx similarity index 100% rename from svx/inc/svx/svdfield.hxx rename to include/svx/svdfield.hxx diff --git a/svx/inc/svx/svdglev.hxx b/include/svx/svdglev.hxx similarity index 100% rename from svx/inc/svx/svdglev.hxx rename to include/svx/svdglev.hxx diff --git a/svx/inc/svx/svdglob.hxx b/include/svx/svdglob.hxx similarity index 100% rename from svx/inc/svx/svdglob.hxx rename to include/svx/svdglob.hxx diff --git a/svx/inc/svx/svdglue.hxx b/include/svx/svdglue.hxx similarity index 100% rename from svx/inc/svx/svdglue.hxx rename to include/svx/svdglue.hxx diff --git a/svx/inc/svx/svdhdl.hxx b/include/svx/svdhdl.hxx similarity index 100% rename from svx/inc/svx/svdhdl.hxx rename to include/svx/svdhdl.hxx diff --git a/svx/inc/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx similarity index 100% rename from svx/inc/svx/svdhlpln.hxx rename to include/svx/svdhlpln.hxx diff --git a/svx/inc/svx/svditer.hxx b/include/svx/svditer.hxx similarity index 100% rename from svx/inc/svx/svditer.hxx rename to include/svx/svditer.hxx diff --git a/svx/inc/svx/svdlayer.hxx b/include/svx/svdlayer.hxx similarity index 100% rename from svx/inc/svx/svdlayer.hxx rename to include/svx/svdlayer.hxx diff --git a/svx/inc/svx/svdmark.hxx b/include/svx/svdmark.hxx similarity index 100% rename from svx/inc/svx/svdmark.hxx rename to include/svx/svdmark.hxx diff --git a/svx/inc/svx/svdmodel.hxx b/include/svx/svdmodel.hxx similarity index 100% rename from svx/inc/svx/svdmodel.hxx rename to include/svx/svdmodel.hxx diff --git a/svx/inc/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx similarity index 100% rename from svx/inc/svx/svdmrkv.hxx rename to include/svx/svdmrkv.hxx diff --git a/svx/inc/svx/svdoashp.hxx b/include/svx/svdoashp.hxx similarity index 100% rename from svx/inc/svx/svdoashp.hxx rename to include/svx/svdoashp.hxx diff --git a/svx/inc/svx/svdoattr.hxx b/include/svx/svdoattr.hxx similarity index 100% rename from svx/inc/svx/svdoattr.hxx rename to include/svx/svdoattr.hxx diff --git a/svx/inc/svx/svdobj.hxx b/include/svx/svdobj.hxx similarity index 100% rename from svx/inc/svx/svdobj.hxx rename to include/svx/svdobj.hxx diff --git a/svx/inc/svx/svdocapt.hxx b/include/svx/svdocapt.hxx similarity index 100% rename from svx/inc/svx/svdocapt.hxx rename to include/svx/svdocapt.hxx diff --git a/svx/inc/svx/svdocirc.hxx b/include/svx/svdocirc.hxx similarity index 100% rename from svx/inc/svx/svdocirc.hxx rename to include/svx/svdocirc.hxx diff --git a/svx/inc/svx/svdoedge.hxx b/include/svx/svdoedge.hxx similarity index 100% rename from svx/inc/svx/svdoedge.hxx rename to include/svx/svdoedge.hxx diff --git a/svx/inc/svx/svdograf.hxx b/include/svx/svdograf.hxx similarity index 100% rename from svx/inc/svx/svdograf.hxx rename to include/svx/svdograf.hxx diff --git a/svx/inc/svx/svdogrp.hxx b/include/svx/svdogrp.hxx similarity index 100% rename from svx/inc/svx/svdogrp.hxx rename to include/svx/svdogrp.hxx diff --git a/svx/inc/svx/svdomeas.hxx b/include/svx/svdomeas.hxx similarity index 100% rename from svx/inc/svx/svdomeas.hxx rename to include/svx/svdomeas.hxx diff --git a/svx/inc/svx/svdomedia.hxx b/include/svx/svdomedia.hxx similarity index 100% rename from svx/inc/svx/svdomedia.hxx rename to include/svx/svdomedia.hxx diff --git a/svx/inc/svx/svdoole2.hxx b/include/svx/svdoole2.hxx similarity index 100% rename from svx/inc/svx/svdoole2.hxx rename to include/svx/svdoole2.hxx diff --git a/svx/inc/svx/svdopage.hxx b/include/svx/svdopage.hxx similarity index 100% rename from svx/inc/svx/svdopage.hxx rename to include/svx/svdopage.hxx diff --git a/svx/inc/svx/svdopath.hxx b/include/svx/svdopath.hxx similarity index 100% rename from svx/inc/svx/svdopath.hxx rename to include/svx/svdopath.hxx diff --git a/svx/inc/svx/svdorect.hxx b/include/svx/svdorect.hxx similarity index 100% rename from svx/inc/svx/svdorect.hxx rename to include/svx/svdorect.hxx diff --git a/svx/inc/svx/svdotable.hxx b/include/svx/svdotable.hxx similarity index 100% rename from svx/inc/svx/svdotable.hxx rename to include/svx/svdotable.hxx diff --git a/svx/inc/svx/svdotext.hxx b/include/svx/svdotext.hxx similarity index 100% rename from svx/inc/svx/svdotext.hxx rename to include/svx/svdotext.hxx diff --git a/svx/inc/svx/svdouno.hxx b/include/svx/svdouno.hxx similarity index 100% rename from svx/inc/svx/svdouno.hxx rename to include/svx/svdouno.hxx diff --git a/svx/inc/svx/svdoutl.hxx b/include/svx/svdoutl.hxx similarity index 100% rename from svx/inc/svx/svdoutl.hxx rename to include/svx/svdoutl.hxx diff --git a/svx/inc/svx/svdovirt.hxx b/include/svx/svdovirt.hxx similarity index 100% rename from svx/inc/svx/svdovirt.hxx rename to include/svx/svdovirt.hxx diff --git a/svx/inc/svx/svdpage.hxx b/include/svx/svdpage.hxx similarity index 100% rename from svx/inc/svx/svdpage.hxx rename to include/svx/svdpage.hxx diff --git a/svx/inc/svx/svdpagv.hxx b/include/svx/svdpagv.hxx similarity index 100% rename from svx/inc/svx/svdpagv.hxx rename to include/svx/svdpagv.hxx diff --git a/svx/inc/svx/svdpntv.hxx b/include/svx/svdpntv.hxx similarity index 100% rename from svx/inc/svx/svdpntv.hxx rename to include/svx/svdpntv.hxx diff --git a/svx/inc/svx/svdpoev.hxx b/include/svx/svdpoev.hxx similarity index 100% rename from svx/inc/svx/svdpoev.hxx rename to include/svx/svdpoev.hxx diff --git a/svx/inc/svx/svdpool.hxx b/include/svx/svdpool.hxx similarity index 100% rename from svx/inc/svx/svdpool.hxx rename to include/svx/svdpool.hxx diff --git a/svx/inc/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx similarity index 100% rename from svx/inc/svx/svdsnpv.hxx rename to include/svx/svdsnpv.hxx diff --git a/svx/inc/svx/svdsob.hxx b/include/svx/svdsob.hxx similarity index 100% rename from svx/inc/svx/svdsob.hxx rename to include/svx/svdsob.hxx diff --git a/svx/inc/svx/svdstr.hrc b/include/svx/svdstr.hrc similarity index 100% rename from svx/inc/svx/svdstr.hrc rename to include/svx/svdstr.hrc diff --git a/svx/inc/svx/svdtext.hxx b/include/svx/svdtext.hxx similarity index 100% rename from svx/inc/svx/svdtext.hxx rename to include/svx/svdtext.hxx diff --git a/svx/inc/svx/svdtrans.hxx b/include/svx/svdtrans.hxx similarity index 100% rename from svx/inc/svx/svdtrans.hxx rename to include/svx/svdtrans.hxx diff --git a/svx/inc/svx/svdtypes.hxx b/include/svx/svdtypes.hxx similarity index 100% rename from svx/inc/svx/svdtypes.hxx rename to include/svx/svdtypes.hxx diff --git a/svx/inc/svx/svdundo.hxx b/include/svx/svdundo.hxx similarity index 100% rename from svx/inc/svx/svdundo.hxx rename to include/svx/svdundo.hxx diff --git a/svx/inc/svx/svdview.hxx b/include/svx/svdview.hxx similarity index 100% rename from svx/inc/svx/svdview.hxx rename to include/svx/svdview.hxx diff --git a/svx/inc/svx/svdviter.hxx b/include/svx/svdviter.hxx similarity index 100% rename from svx/inc/svx/svdviter.hxx rename to include/svx/svdviter.hxx diff --git a/svx/inc/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx similarity index 100% rename from svx/inc/svx/svdxcgv.hxx rename to include/svx/svdxcgv.hxx diff --git a/svx/inc/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx similarity index 100% rename from svx/inc/svx/svx3ditems.hxx rename to include/svx/svx3ditems.hxx diff --git a/svx/inc/svx/svxcommands.h b/include/svx/svxcommands.h similarity index 100% rename from svx/inc/svx/svxcommands.h rename to include/svx/svxcommands.h diff --git a/svx/inc/svx/svxdlg.hxx b/include/svx/svxdlg.hxx similarity index 100% rename from svx/inc/svx/svxdlg.hxx rename to include/svx/svxdlg.hxx diff --git a/svx/inc/svx/svxdllapi.h b/include/svx/svxdllapi.h similarity index 100% rename from svx/inc/svx/svxdllapi.h rename to include/svx/svxdllapi.h diff --git a/svx/inc/svx/svxerr.hxx b/include/svx/svxerr.hxx similarity index 100% rename from svx/inc/svx/svxerr.hxx rename to include/svx/svxerr.hxx diff --git a/svx/inc/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx similarity index 100% rename from svx/inc/svx/svxgrahicitem.hxx rename to include/svx/svxgrahicitem.hxx diff --git a/svx/inc/svx/svxids.hrc b/include/svx/svxids.hrc similarity index 100% rename from svx/inc/svx/svxids.hrc rename to include/svx/svxids.hrc diff --git a/svx/inc/svx/svxitems.hrc b/include/svx/svxitems.hrc similarity index 100% rename from svx/inc/svx/svxitems.hrc rename to include/svx/svxitems.hrc diff --git a/svx/inc/svx/swframeexample.hxx b/include/svx/swframeexample.hxx similarity index 100% rename from svx/inc/svx/swframeexample.hxx rename to include/svx/swframeexample.hxx diff --git a/svx/inc/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx similarity index 100% rename from svx/inc/svx/swframeposstrings.hxx rename to include/svx/swframeposstrings.hxx diff --git a/svx/inc/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx similarity index 100% rename from svx/inc/svx/swframevalidation.hxx rename to include/svx/swframevalidation.hxx diff --git a/svx/inc/svx/sxallitm.hxx b/include/svx/sxallitm.hxx similarity index 100% rename from svx/inc/svx/sxallitm.hxx rename to include/svx/sxallitm.hxx diff --git a/svx/inc/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx similarity index 100% rename from svx/inc/svx/sxcaitm.hxx rename to include/svx/sxcaitm.hxx diff --git a/svx/inc/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx similarity index 100% rename from svx/inc/svx/sxcecitm.hxx rename to include/svx/sxcecitm.hxx diff --git a/svx/inc/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx similarity index 100% rename from svx/inc/svx/sxcgitm.hxx rename to include/svx/sxcgitm.hxx diff --git a/svx/inc/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx similarity index 100% rename from svx/inc/svx/sxciaitm.hxx rename to include/svx/sxciaitm.hxx diff --git a/svx/inc/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx similarity index 100% rename from svx/inc/svx/sxcikitm.hxx rename to include/svx/sxcikitm.hxx diff --git a/svx/inc/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx similarity index 100% rename from svx/inc/svx/sxcllitm.hxx rename to include/svx/sxcllitm.hxx diff --git a/svx/inc/svx/sxctitm.hxx b/include/svx/sxctitm.hxx similarity index 100% rename from svx/inc/svx/sxctitm.hxx rename to include/svx/sxctitm.hxx diff --git a/svx/inc/svx/sxekitm.hxx b/include/svx/sxekitm.hxx similarity index 100% rename from svx/inc/svx/sxekitm.hxx rename to include/svx/sxekitm.hxx diff --git a/svx/inc/svx/sxelditm.hxx b/include/svx/sxelditm.hxx similarity index 100% rename from svx/inc/svx/sxelditm.hxx rename to include/svx/sxelditm.hxx diff --git a/svx/inc/svx/sxenditm.hxx b/include/svx/sxenditm.hxx similarity index 100% rename from svx/inc/svx/sxenditm.hxx rename to include/svx/sxenditm.hxx diff --git a/svx/inc/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx similarity index 100% rename from svx/inc/svx/sxfiitm.hxx rename to include/svx/sxfiitm.hxx diff --git a/svx/inc/svx/sxlayitm.hxx b/include/svx/sxlayitm.hxx similarity index 100% rename from svx/inc/svx/sxlayitm.hxx rename to include/svx/sxlayitm.hxx diff --git a/svx/inc/svx/sxlogitm.hxx b/include/svx/sxlogitm.hxx similarity index 100% rename from svx/inc/svx/sxlogitm.hxx rename to include/svx/sxlogitm.hxx diff --git a/svx/inc/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx similarity index 100% rename from svx/inc/svx/sxmbritm.hxx rename to include/svx/sxmbritm.hxx diff --git a/svx/inc/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx similarity index 100% rename from svx/inc/svx/sxmfsitm.hxx rename to include/svx/sxmfsitm.hxx diff --git a/svx/inc/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx similarity index 100% rename from svx/inc/svx/sxmkitm.hxx rename to include/svx/sxmkitm.hxx diff --git a/svx/inc/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx similarity index 100% rename from svx/inc/svx/sxmlhitm.hxx rename to include/svx/sxmlhitm.hxx diff --git a/svx/inc/svx/sxmoitm.hxx b/include/svx/sxmoitm.hxx similarity index 100% rename from svx/inc/svx/sxmoitm.hxx rename to include/svx/sxmoitm.hxx diff --git a/svx/inc/svx/sxmovitm.hxx b/include/svx/sxmovitm.hxx similarity index 100% rename from svx/inc/svx/sxmovitm.hxx rename to include/svx/sxmovitm.hxx diff --git a/svx/inc/svx/sxmsitm.hxx b/include/svx/sxmsitm.hxx similarity index 100% rename from svx/inc/svx/sxmsitm.hxx rename to include/svx/sxmsitm.hxx diff --git a/svx/inc/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx similarity index 100% rename from svx/inc/svx/sxmspitm.hxx rename to include/svx/sxmspitm.hxx diff --git a/svx/inc/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx similarity index 100% rename from svx/inc/svx/sxmsuitm.hxx rename to include/svx/sxmsuitm.hxx diff --git a/svx/inc/svx/sxmtaitm.hxx b/include/svx/sxmtaitm.hxx similarity index 100% rename from svx/inc/svx/sxmtaitm.hxx rename to include/svx/sxmtaitm.hxx diff --git a/svx/inc/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx similarity index 100% rename from svx/inc/svx/sxmtfitm.hxx rename to include/svx/sxmtfitm.hxx diff --git a/svx/inc/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx similarity index 100% rename from svx/inc/svx/sxmtpitm.hxx rename to include/svx/sxmtpitm.hxx diff --git a/svx/inc/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx similarity index 100% rename from svx/inc/svx/sxmtritm.hxx rename to include/svx/sxmtritm.hxx diff --git a/svx/inc/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx similarity index 100% rename from svx/inc/svx/sxmuitm.hxx rename to include/svx/sxmuitm.hxx diff --git a/svx/inc/svx/sxoneitm.hxx b/include/svx/sxoneitm.hxx similarity index 100% rename from svx/inc/svx/sxoneitm.hxx rename to include/svx/sxoneitm.hxx diff --git a/svx/inc/svx/sxonitm.hxx b/include/svx/sxonitm.hxx similarity index 100% rename from svx/inc/svx/sxonitm.hxx rename to include/svx/sxonitm.hxx diff --git a/svx/inc/svx/sxopitm.hxx b/include/svx/sxopitm.hxx similarity index 100% rename from svx/inc/svx/sxopitm.hxx rename to include/svx/sxopitm.hxx diff --git a/svx/inc/svx/sxraitm.hxx b/include/svx/sxraitm.hxx similarity index 100% rename from svx/inc/svx/sxraitm.hxx rename to include/svx/sxraitm.hxx diff --git a/svx/inc/svx/sxreaitm.hxx b/include/svx/sxreaitm.hxx similarity index 100% rename from svx/inc/svx/sxreaitm.hxx rename to include/svx/sxreaitm.hxx diff --git a/svx/inc/svx/sxreoitm.hxx b/include/svx/sxreoitm.hxx similarity index 100% rename from svx/inc/svx/sxreoitm.hxx rename to include/svx/sxreoitm.hxx diff --git a/svx/inc/svx/sxroaitm.hxx b/include/svx/sxroaitm.hxx similarity index 100% rename from svx/inc/svx/sxroaitm.hxx rename to include/svx/sxroaitm.hxx diff --git a/svx/inc/svx/sxrooitm.hxx b/include/svx/sxrooitm.hxx similarity index 100% rename from svx/inc/svx/sxrooitm.hxx rename to include/svx/sxrooitm.hxx diff --git a/svx/inc/svx/sxsaitm.hxx b/include/svx/sxsaitm.hxx similarity index 100% rename from svx/inc/svx/sxsaitm.hxx rename to include/svx/sxsaitm.hxx diff --git a/svx/inc/svx/sxsalitm.hxx b/include/svx/sxsalitm.hxx similarity index 100% rename from svx/inc/svx/sxsalitm.hxx rename to include/svx/sxsalitm.hxx diff --git a/svx/inc/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx similarity index 100% rename from svx/inc/svx/sxsiitm.hxx rename to include/svx/sxsiitm.hxx diff --git a/svx/inc/svx/sxsoitm.hxx b/include/svx/sxsoitm.hxx similarity index 100% rename from svx/inc/svx/sxsoitm.hxx rename to include/svx/sxsoitm.hxx diff --git a/svx/inc/svx/sxtraitm.hxx b/include/svx/sxtraitm.hxx similarity index 100% rename from svx/inc/svx/sxtraitm.hxx rename to include/svx/sxtraitm.hxx diff --git a/svx/inc/svx/tabarea.hxx b/include/svx/tabarea.hxx similarity index 100% rename from svx/inc/svx/tabarea.hxx rename to include/svx/tabarea.hxx diff --git a/svx/inc/svx/tabline.hxx b/include/svx/tabline.hxx similarity index 100% rename from svx/inc/svx/tabline.hxx rename to include/svx/tabline.hxx diff --git a/svx/inc/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx similarity index 100% rename from svx/inc/svx/tbcontrl.hxx rename to include/svx/tbcontrl.hxx diff --git a/svx/inc/svx/tbxalign.hxx b/include/svx/tbxalign.hxx similarity index 100% rename from svx/inc/svx/tbxalign.hxx rename to include/svx/tbxalign.hxx diff --git a/svx/inc/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx similarity index 100% rename from svx/inc/svx/tbxcolor.hxx rename to include/svx/tbxcolor.hxx diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx similarity index 100% rename from svx/inc/svx/tbxcolorupdate.hxx rename to include/svx/tbxcolorupdate.hxx diff --git a/svx/inc/svx/tbxctl.hxx b/include/svx/tbxctl.hxx similarity index 100% rename from svx/inc/svx/tbxctl.hxx rename to include/svx/tbxctl.hxx diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx similarity index 100% rename from svx/inc/svx/tbxcustomshapes.hxx rename to include/svx/tbxcustomshapes.hxx diff --git a/svx/inc/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx similarity index 100% rename from svx/inc/svx/tbxdraw.hxx rename to include/svx/tbxdraw.hxx diff --git a/svx/inc/svx/txencbox.hxx b/include/svx/txencbox.hxx similarity index 100% rename from svx/inc/svx/txencbox.hxx rename to include/svx/txencbox.hxx diff --git a/svx/inc/svx/txenctab.hxx b/include/svx/txenctab.hxx similarity index 100% rename from svx/inc/svx/txenctab.hxx rename to include/svx/txenctab.hxx diff --git a/svx/inc/svx/ucsubset.hrc b/include/svx/ucsubset.hrc similarity index 100% rename from svx/inc/svx/ucsubset.hrc rename to include/svx/ucsubset.hrc diff --git a/svx/inc/svx/ucsubset.hxx b/include/svx/ucsubset.hxx similarity index 100% rename from svx/inc/svx/ucsubset.hxx rename to include/svx/ucsubset.hxx diff --git a/svx/inc/svx/unoapi.hxx b/include/svx/unoapi.hxx similarity index 100% rename from svx/inc/svx/unoapi.hxx rename to include/svx/unoapi.hxx diff --git a/svx/inc/svx/unofill.hxx b/include/svx/unofill.hxx similarity index 100% rename from svx/inc/svx/unofill.hxx rename to include/svx/unofill.hxx diff --git a/svx/inc/svx/unomaster.hxx b/include/svx/unomaster.hxx similarity index 100% rename from svx/inc/svx/unomaster.hxx rename to include/svx/unomaster.hxx diff --git a/svx/inc/svx/unomid.hxx b/include/svx/unomid.hxx similarity index 100% rename from svx/inc/svx/unomid.hxx rename to include/svx/unomid.hxx diff --git a/svx/inc/svx/unomod.hxx b/include/svx/unomod.hxx similarity index 100% rename from svx/inc/svx/unomod.hxx rename to include/svx/unomod.hxx diff --git a/svx/inc/svx/unomodel.hxx b/include/svx/unomodel.hxx similarity index 100% rename from svx/inc/svx/unomodel.hxx rename to include/svx/unomodel.hxx diff --git a/svx/inc/svx/unopage.hxx b/include/svx/unopage.hxx similarity index 100% rename from svx/inc/svx/unopage.hxx rename to include/svx/unopage.hxx diff --git a/svx/inc/svx/unopool.hxx b/include/svx/unopool.hxx similarity index 100% rename from svx/inc/svx/unopool.hxx rename to include/svx/unopool.hxx diff --git a/svx/inc/svx/unoprov.hxx b/include/svx/unoprov.hxx similarity index 100% rename from svx/inc/svx/unoprov.hxx rename to include/svx/unoprov.hxx diff --git a/svx/inc/svx/unoshape.hxx b/include/svx/unoshape.hxx similarity index 100% rename from svx/inc/svx/unoshape.hxx rename to include/svx/unoshape.hxx diff --git a/svx/inc/svx/unoshcol.hxx b/include/svx/unoshcol.hxx similarity index 100% rename from svx/inc/svx/unoshcol.hxx rename to include/svx/unoshcol.hxx diff --git a/svx/inc/svx/unoshprp.hxx b/include/svx/unoshprp.hxx similarity index 100% rename from svx/inc/svx/unoshprp.hxx rename to include/svx/unoshprp.hxx diff --git a/svx/inc/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx similarity index 100% rename from svx/inc/svx/unoshtxt.hxx rename to include/svx/unoshtxt.hxx diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx similarity index 100% rename from svx/inc/svx/verttexttbxctrl.hxx rename to include/svx/verttexttbxctrl.hxx diff --git a/svx/inc/svx/view3d.hxx b/include/svx/view3d.hxx similarity index 100% rename from svx/inc/svx/view3d.hxx rename to include/svx/view3d.hxx diff --git a/svx/inc/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx similarity index 100% rename from svx/inc/svx/viewlayoutitem.hxx rename to include/svx/viewlayoutitem.hxx diff --git a/svx/inc/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx similarity index 100% rename from svx/inc/svx/viewpt3d.hxx rename to include/svx/viewpt3d.hxx diff --git a/svx/inc/svx/wrapfield.hxx b/include/svx/wrapfield.hxx similarity index 100% rename from svx/inc/svx/wrapfield.hxx rename to include/svx/wrapfield.hxx diff --git a/svx/inc/svx/xattr.hxx b/include/svx/xattr.hxx similarity index 100% rename from svx/inc/svx/xattr.hxx rename to include/svx/xattr.hxx diff --git a/svx/inc/svx/xbitmap.hxx b/include/svx/xbitmap.hxx similarity index 100% rename from svx/inc/svx/xbitmap.hxx rename to include/svx/xbitmap.hxx diff --git a/svx/inc/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx similarity index 100% rename from svx/inc/svx/xbtmpit.hxx rename to include/svx/xbtmpit.hxx diff --git a/svx/inc/svx/xcolit.hxx b/include/svx/xcolit.hxx similarity index 100% rename from svx/inc/svx/xcolit.hxx rename to include/svx/xcolit.hxx diff --git a/svx/inc/svx/xdash.hxx b/include/svx/xdash.hxx similarity index 100% rename from svx/inc/svx/xdash.hxx rename to include/svx/xdash.hxx diff --git a/svx/inc/svx/xdef.hxx b/include/svx/xdef.hxx similarity index 100% rename from svx/inc/svx/xdef.hxx rename to include/svx/xdef.hxx diff --git a/svx/inc/svx/xenum.hxx b/include/svx/xenum.hxx similarity index 100% rename from svx/inc/svx/xenum.hxx rename to include/svx/xenum.hxx diff --git a/svx/inc/svx/xexch.hxx b/include/svx/xexch.hxx similarity index 100% rename from svx/inc/svx/xexch.hxx rename to include/svx/xexch.hxx diff --git a/svx/inc/svx/xfillit.hxx b/include/svx/xfillit.hxx similarity index 100% rename from svx/inc/svx/xfillit.hxx rename to include/svx/xfillit.hxx diff --git a/svx/inc/svx/xfillit0.hxx b/include/svx/xfillit0.hxx similarity index 100% rename from svx/inc/svx/xfillit0.hxx rename to include/svx/xfillit0.hxx diff --git a/svx/inc/svx/xflasit.hxx b/include/svx/xflasit.hxx similarity index 100% rename from svx/inc/svx/xflasit.hxx rename to include/svx/xflasit.hxx diff --git a/svx/inc/svx/xflbckit.hxx b/include/svx/xflbckit.hxx similarity index 100% rename from svx/inc/svx/xflbckit.hxx rename to include/svx/xflbckit.hxx diff --git a/svx/inc/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx similarity index 100% rename from svx/inc/svx/xflbmpit.hxx rename to include/svx/xflbmpit.hxx diff --git a/svx/inc/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx similarity index 100% rename from svx/inc/svx/xflbmsli.hxx rename to include/svx/xflbmsli.hxx diff --git a/svx/inc/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx similarity index 100% rename from svx/inc/svx/xflbmsxy.hxx rename to include/svx/xflbmsxy.hxx diff --git a/svx/inc/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx similarity index 100% rename from svx/inc/svx/xflbmtit.hxx rename to include/svx/xflbmtit.hxx diff --git a/svx/inc/svx/xflboxy.hxx b/include/svx/xflboxy.hxx similarity index 100% rename from svx/inc/svx/xflboxy.hxx rename to include/svx/xflboxy.hxx diff --git a/svx/inc/svx/xflbstit.hxx b/include/svx/xflbstit.hxx similarity index 100% rename from svx/inc/svx/xflbstit.hxx rename to include/svx/xflbstit.hxx diff --git a/svx/inc/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx similarity index 100% rename from svx/inc/svx/xflbtoxy.hxx rename to include/svx/xflbtoxy.hxx diff --git a/svx/inc/svx/xflclit.hxx b/include/svx/xflclit.hxx similarity index 100% rename from svx/inc/svx/xflclit.hxx rename to include/svx/xflclit.hxx diff --git a/svx/inc/svx/xflftrit.hxx b/include/svx/xflftrit.hxx similarity index 100% rename from svx/inc/svx/xflftrit.hxx rename to include/svx/xflftrit.hxx diff --git a/svx/inc/svx/xflgrit.hxx b/include/svx/xflgrit.hxx similarity index 100% rename from svx/inc/svx/xflgrit.hxx rename to include/svx/xflgrit.hxx diff --git a/svx/inc/svx/xflhtit.hxx b/include/svx/xflhtit.hxx similarity index 100% rename from svx/inc/svx/xflhtit.hxx rename to include/svx/xflhtit.hxx diff --git a/svx/inc/svx/xfltrit.hxx b/include/svx/xfltrit.hxx similarity index 100% rename from svx/inc/svx/xfltrit.hxx rename to include/svx/xfltrit.hxx diff --git a/svx/inc/svx/xftadit.hxx b/include/svx/xftadit.hxx similarity index 100% rename from svx/inc/svx/xftadit.hxx rename to include/svx/xftadit.hxx diff --git a/svx/inc/svx/xftdiit.hxx b/include/svx/xftdiit.hxx similarity index 100% rename from svx/inc/svx/xftdiit.hxx rename to include/svx/xftdiit.hxx diff --git a/svx/inc/svx/xftmrit.hxx b/include/svx/xftmrit.hxx similarity index 100% rename from svx/inc/svx/xftmrit.hxx rename to include/svx/xftmrit.hxx diff --git a/svx/inc/svx/xftouit.hxx b/include/svx/xftouit.hxx similarity index 100% rename from svx/inc/svx/xftouit.hxx rename to include/svx/xftouit.hxx diff --git a/svx/inc/svx/xftsfit.hxx b/include/svx/xftsfit.hxx similarity index 100% rename from svx/inc/svx/xftsfit.hxx rename to include/svx/xftsfit.hxx diff --git a/svx/inc/svx/xftshcit.hxx b/include/svx/xftshcit.hxx similarity index 100% rename from svx/inc/svx/xftshcit.hxx rename to include/svx/xftshcit.hxx diff --git a/svx/inc/svx/xftshit.hxx b/include/svx/xftshit.hxx similarity index 100% rename from svx/inc/svx/xftshit.hxx rename to include/svx/xftshit.hxx diff --git a/svx/inc/svx/xftshtit.hxx b/include/svx/xftshtit.hxx similarity index 100% rename from svx/inc/svx/xftshtit.hxx rename to include/svx/xftshtit.hxx diff --git a/svx/inc/svx/xftshxy.hxx b/include/svx/xftshxy.hxx similarity index 100% rename from svx/inc/svx/xftshxy.hxx rename to include/svx/xftshxy.hxx diff --git a/svx/inc/svx/xftstit.hxx b/include/svx/xftstit.hxx similarity index 100% rename from svx/inc/svx/xftstit.hxx rename to include/svx/xftstit.hxx diff --git a/svx/inc/svx/xgrad.hxx b/include/svx/xgrad.hxx similarity index 100% rename from svx/inc/svx/xgrad.hxx rename to include/svx/xgrad.hxx diff --git a/svx/inc/svx/xgrscit.hxx b/include/svx/xgrscit.hxx similarity index 100% rename from svx/inc/svx/xgrscit.hxx rename to include/svx/xgrscit.hxx diff --git a/svx/inc/svx/xhatch.hxx b/include/svx/xhatch.hxx similarity index 100% rename from svx/inc/svx/xhatch.hxx rename to include/svx/xhatch.hxx diff --git a/svx/inc/svx/xit.hxx b/include/svx/xit.hxx similarity index 100% rename from svx/inc/svx/xit.hxx rename to include/svx/xit.hxx diff --git a/svx/inc/svx/xlineit.hxx b/include/svx/xlineit.hxx similarity index 100% rename from svx/inc/svx/xlineit.hxx rename to include/svx/xlineit.hxx diff --git a/svx/inc/svx/xlineit0.hxx b/include/svx/xlineit0.hxx similarity index 100% rename from svx/inc/svx/xlineit0.hxx rename to include/svx/xlineit0.hxx diff --git a/svx/inc/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx similarity index 100% rename from svx/inc/svx/xlinjoit.hxx rename to include/svx/xlinjoit.hxx diff --git a/svx/inc/svx/xlnasit.hxx b/include/svx/xlnasit.hxx similarity index 100% rename from svx/inc/svx/xlnasit.hxx rename to include/svx/xlnasit.hxx diff --git a/svx/inc/svx/xlncapit.hxx b/include/svx/xlncapit.hxx similarity index 100% rename from svx/inc/svx/xlncapit.hxx rename to include/svx/xlncapit.hxx diff --git a/svx/inc/svx/xlnclit.hxx b/include/svx/xlnclit.hxx similarity index 100% rename from svx/inc/svx/xlnclit.hxx rename to include/svx/xlnclit.hxx diff --git a/svx/inc/svx/xlndsit.hxx b/include/svx/xlndsit.hxx similarity index 100% rename from svx/inc/svx/xlndsit.hxx rename to include/svx/xlndsit.hxx diff --git a/svx/inc/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx similarity index 100% rename from svx/inc/svx/xlnedcit.hxx rename to include/svx/xlnedcit.hxx diff --git a/svx/inc/svx/xlnedit.hxx b/include/svx/xlnedit.hxx similarity index 100% rename from svx/inc/svx/xlnedit.hxx rename to include/svx/xlnedit.hxx diff --git a/svx/inc/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx similarity index 100% rename from svx/inc/svx/xlnedwit.hxx rename to include/svx/xlnedwit.hxx diff --git a/svx/inc/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx similarity index 100% rename from svx/inc/svx/xlnstcit.hxx rename to include/svx/xlnstcit.hxx diff --git a/svx/inc/svx/xlnstit.hxx b/include/svx/xlnstit.hxx similarity index 100% rename from svx/inc/svx/xlnstit.hxx rename to include/svx/xlnstit.hxx diff --git a/svx/inc/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx similarity index 100% rename from svx/inc/svx/xlnstwit.hxx rename to include/svx/xlnstwit.hxx diff --git a/svx/inc/svx/xlntrit.hxx b/include/svx/xlntrit.hxx similarity index 100% rename from svx/inc/svx/xlntrit.hxx rename to include/svx/xlntrit.hxx diff --git a/svx/inc/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx similarity index 100% rename from svx/inc/svx/xlnwtit.hxx rename to include/svx/xlnwtit.hxx diff --git a/svx/inc/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx similarity index 100% rename from svx/inc/svx/xmleohlp.hxx rename to include/svx/xmleohlp.hxx diff --git a/svx/inc/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx similarity index 100% rename from svx/inc/svx/xmlexchg.hxx rename to include/svx/xmlexchg.hxx diff --git a/svx/inc/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx similarity index 100% rename from svx/inc/svx/xmlgrhlp.hxx rename to include/svx/xmlgrhlp.hxx diff --git a/svx/inc/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx similarity index 100% rename from svx/inc/svx/xmlsecctrl.hxx rename to include/svx/xmlsecctrl.hxx diff --git a/svx/inc/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx similarity index 100% rename from svx/inc/svx/xoutbmp.hxx rename to include/svx/xoutbmp.hxx diff --git a/svx/inc/svx/xpoly.hxx b/include/svx/xpoly.hxx similarity index 100% rename from svx/inc/svx/xpoly.hxx rename to include/svx/xpoly.hxx diff --git a/svx/inc/svx/xpool.hxx b/include/svx/xpool.hxx similarity index 100% rename from svx/inc/svx/xpool.hxx rename to include/svx/xpool.hxx diff --git a/svx/inc/svx/xsetit.hxx b/include/svx/xsetit.hxx similarity index 100% rename from svx/inc/svx/xsetit.hxx rename to include/svx/xsetit.hxx diff --git a/svx/inc/svx/xsflclit.hxx b/include/svx/xsflclit.hxx similarity index 100% rename from svx/inc/svx/xsflclit.hxx rename to include/svx/xsflclit.hxx diff --git a/svx/inc/svx/xtable.hxx b/include/svx/xtable.hxx similarity index 100% rename from svx/inc/svx/xtable.hxx rename to include/svx/xtable.hxx diff --git a/svx/inc/svx/xtextit.hxx b/include/svx/xtextit.hxx similarity index 100% rename from svx/inc/svx/xtextit.hxx rename to include/svx/xtextit.hxx diff --git a/svx/inc/svx/xtextit0.hxx b/include/svx/xtextit0.hxx similarity index 100% rename from svx/inc/svx/xtextit0.hxx rename to include/svx/xtextit0.hxx diff --git a/svx/inc/svx/zoom_def.hxx b/include/svx/zoom_def.hxx similarity index 100% rename from svx/inc/svx/zoom_def.hxx rename to include/svx/zoom_def.hxx diff --git a/svx/inc/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx similarity index 100% rename from svx/inc/svx/zoomctrl.hxx rename to include/svx/zoomctrl.hxx diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx similarity index 100% rename from svx/inc/svx/zoomsliderctrl.hxx rename to include/svx/zoomsliderctrl.hxx diff --git a/svx/inc/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx similarity index 100% rename from svx/inc/svx/zoomslideritem.hxx rename to include/svx/zoomslideritem.hxx diff --git a/test/inc/test/beans/xpropertyset.hxx b/include/test/beans/xpropertyset.hxx similarity index 100% rename from test/inc/test/beans/xpropertyset.hxx rename to include/test/beans/xpropertyset.hxx diff --git a/test/inc/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx similarity index 100% rename from test/inc/test/bootstrapfixture.hxx rename to include/test/bootstrapfixture.hxx diff --git a/test/inc/test/container/xelementaccess.hxx b/include/test/container/xelementaccess.hxx similarity index 100% rename from test/inc/test/container/xelementaccess.hxx rename to include/test/container/xelementaccess.hxx diff --git a/test/inc/test/container/xindexaccess.hxx b/include/test/container/xindexaccess.hxx similarity index 100% rename from test/inc/test/container/xindexaccess.hxx rename to include/test/container/xindexaccess.hxx diff --git a/test/inc/test/container/xnamecontainer.hxx b/include/test/container/xnamecontainer.hxx similarity index 100% rename from test/inc/test/container/xnamecontainer.hxx rename to include/test/container/xnamecontainer.hxx diff --git a/test/inc/test/container/xnamed.hxx b/include/test/container/xnamed.hxx similarity index 100% rename from test/inc/test/container/xnamed.hxx rename to include/test/container/xnamed.hxx diff --git a/test/inc/test/container/xnamereplace.hxx b/include/test/container/xnamereplace.hxx similarity index 100% rename from test/inc/test/container/xnamereplace.hxx rename to include/test/container/xnamereplace.hxx diff --git a/test/inc/test/sheet/cellproperties.hxx b/include/test/sheet/cellproperties.hxx similarity index 100% rename from test/inc/test/sheet/cellproperties.hxx rename to include/test/sheet/cellproperties.hxx diff --git a/test/inc/test/sheet/datapilotfield.hxx b/include/test/sheet/datapilotfield.hxx similarity index 100% rename from test/inc/test/sheet/datapilotfield.hxx rename to include/test/sheet/datapilotfield.hxx diff --git a/test/inc/test/sheet/tableautoformatfield.hxx b/include/test/sheet/tableautoformatfield.hxx similarity index 100% rename from test/inc/test/sheet/tableautoformatfield.hxx rename to include/test/sheet/tableautoformatfield.hxx diff --git a/test/inc/test/sheet/xcellrangedata.hxx b/include/test/sheet/xcellrangedata.hxx similarity index 100% rename from test/inc/test/sheet/xcellrangedata.hxx rename to include/test/sheet/xcellrangedata.hxx diff --git a/test/inc/test/sheet/xcellrangereferrer.hxx b/include/test/sheet/xcellrangereferrer.hxx similarity index 100% rename from test/inc/test/sheet/xcellrangereferrer.hxx rename to include/test/sheet/xcellrangereferrer.hxx diff --git a/test/inc/test/sheet/xcellrangesquery.hxx b/include/test/sheet/xcellrangesquery.hxx similarity index 100% rename from test/inc/test/sheet/xcellrangesquery.hxx rename to include/test/sheet/xcellrangesquery.hxx diff --git a/test/inc/test/sheet/xdatabaserange.hxx b/include/test/sheet/xdatabaserange.hxx similarity index 100% rename from test/inc/test/sheet/xdatabaserange.hxx rename to include/test/sheet/xdatabaserange.hxx diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx b/include/test/sheet/xdatapilotdescriptor.hxx similarity index 100% rename from test/inc/test/sheet/xdatapilotdescriptor.hxx rename to include/test/sheet/xdatapilotdescriptor.hxx diff --git a/test/inc/test/sheet/xdatapilotfieldgrouping.hxx b/include/test/sheet/xdatapilotfieldgrouping.hxx similarity index 100% rename from test/inc/test/sheet/xdatapilotfieldgrouping.hxx rename to include/test/sheet/xdatapilotfieldgrouping.hxx diff --git a/test/inc/test/sheet/xdatapilottable.hxx b/include/test/sheet/xdatapilottable.hxx similarity index 100% rename from test/inc/test/sheet/xdatapilottable.hxx rename to include/test/sheet/xdatapilottable.hxx diff --git a/test/inc/test/sheet/xdatapilottable2.hxx b/include/test/sheet/xdatapilottable2.hxx similarity index 100% rename from test/inc/test/sheet/xdatapilottable2.hxx rename to include/test/sheet/xdatapilottable2.hxx diff --git a/test/inc/test/sheet/xgoalseek.hxx b/include/test/sheet/xgoalseek.hxx similarity index 100% rename from test/inc/test/sheet/xgoalseek.hxx rename to include/test/sheet/xgoalseek.hxx diff --git a/test/inc/test/sheet/xnamedrange.hxx b/include/test/sheet/xnamedrange.hxx similarity index 100% rename from test/inc/test/sheet/xnamedrange.hxx rename to include/test/sheet/xnamedrange.hxx diff --git a/test/inc/test/sheet/xnamedranges.hxx b/include/test/sheet/xnamedranges.hxx similarity index 100% rename from test/inc/test/sheet/xnamedranges.hxx rename to include/test/sheet/xnamedranges.hxx diff --git a/test/inc/test/sheet/xprintareas.hxx b/include/test/sheet/xprintareas.hxx similarity index 100% rename from test/inc/test/sheet/xprintareas.hxx rename to include/test/sheet/xprintareas.hxx diff --git a/test/inc/test/sheet/xsheetannotation.hxx b/include/test/sheet/xsheetannotation.hxx similarity index 100% rename from test/inc/test/sheet/xsheetannotation.hxx rename to include/test/sheet/xsheetannotation.hxx diff --git a/test/inc/test/sheet/xsheetannotations.hxx b/include/test/sheet/xsheetannotations.hxx similarity index 100% rename from test/inc/test/sheet/xsheetannotations.hxx rename to include/test/sheet/xsheetannotations.hxx diff --git a/test/inc/test/sheet/xsheetoutline.hxx b/include/test/sheet/xsheetoutline.hxx similarity index 100% rename from test/inc/test/sheet/xsheetoutline.hxx rename to include/test/sheet/xsheetoutline.hxx diff --git a/test/inc/test/sheet/xspreadsheetdocument.hxx b/include/test/sheet/xspreadsheetdocument.hxx similarity index 100% rename from test/inc/test/sheet/xspreadsheetdocument.hxx rename to include/test/sheet/xspreadsheetdocument.hxx diff --git a/test/inc/test/sheet/xspreadsheets2.hxx b/include/test/sheet/xspreadsheets2.hxx similarity index 100% rename from test/inc/test/sheet/xspreadsheets2.hxx rename to include/test/sheet/xspreadsheets2.hxx diff --git a/test/inc/test/testdllapi.hxx b/include/test/testdllapi.hxx similarity index 100% rename from test/inc/test/testdllapi.hxx rename to include/test/testdllapi.hxx diff --git a/test/inc/test/text/xtext.hxx b/include/test/text/xtext.hxx similarity index 100% rename from test/inc/test/text/xtext.hxx rename to include/test/text/xtext.hxx diff --git a/test/inc/test/text/xtextcontent.hxx b/include/test/text/xtextcontent.hxx similarity index 100% rename from test/inc/test/text/xtextcontent.hxx rename to include/test/text/xtextcontent.hxx diff --git a/test/inc/test/text/xtextfield.hxx b/include/test/text/xtextfield.hxx similarity index 100% rename from test/inc/test/text/xtextfield.hxx rename to include/test/text/xtextfield.hxx diff --git a/test/inc/test/unoapi_test.hxx b/include/test/unoapi_test.hxx similarity index 100% rename from test/inc/test/unoapi_test.hxx rename to include/test/unoapi_test.hxx diff --git a/test/inc/test/util/xreplaceable.hxx b/include/test/util/xreplaceable.hxx similarity index 100% rename from test/inc/test/util/xreplaceable.hxx rename to include/test/util/xreplaceable.hxx diff --git a/test/inc/test/util/xsearchable.hxx b/include/test/util/xsearchable.hxx similarity index 100% rename from test/inc/test/util/xsearchable.hxx rename to include/test/util/xsearchable.hxx diff --git a/test/inc/test/xmldiff.hxx b/include/test/xmldiff.hxx similarity index 100% rename from test/inc/test/xmldiff.hxx rename to include/test/xmldiff.hxx diff --git a/toolkit/inc/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/animatedimagespeer.hxx rename to include/toolkit/awt/animatedimagespeer.hxx diff --git a/toolkit/inc/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/scrollabledialog.hxx rename to include/toolkit/awt/scrollabledialog.hxx diff --git a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx rename to include/toolkit/awt/vclxaccessiblecomponent.hxx diff --git a/toolkit/inc/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxbitmap.hxx rename to include/toolkit/awt/vclxbitmap.hxx diff --git a/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxcontainer.hxx rename to include/toolkit/awt/vclxcontainer.hxx diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxdevice.hxx rename to include/toolkit/awt/vclxdevice.hxx diff --git a/toolkit/inc/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxfont.hxx rename to include/toolkit/awt/vclxfont.hxx diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxgraphics.hxx rename to include/toolkit/awt/vclxgraphics.hxx diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxmenu.hxx rename to include/toolkit/awt/vclxmenu.hxx diff --git a/toolkit/inc/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxpointer.hxx rename to include/toolkit/awt/vclxpointer.hxx diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxprinter.hxx rename to include/toolkit/awt/vclxprinter.hxx diff --git a/toolkit/inc/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxregion.hxx rename to include/toolkit/awt/vclxregion.hxx diff --git a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxspinbutton.hxx rename to include/toolkit/awt/vclxspinbutton.hxx diff --git a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx rename to include/toolkit/awt/vclxsystemdependentwindow.hxx diff --git a/toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxtabpagecontainer.hxx rename to include/toolkit/awt/vclxtabpagecontainer.hxx diff --git a/toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx b/include/toolkit/awt/vclxtabpagemodel.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxtabpagemodel.hxx rename to include/toolkit/awt/vclxtabpagemodel.hxx diff --git a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/include/toolkit/awt/vclxtoolkit.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxtoolkit.hxx rename to include/toolkit/awt/vclxtoolkit.hxx diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxtopwindow.hxx rename to include/toolkit/awt/vclxtopwindow.hxx diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxwindow.hxx rename to include/toolkit/awt/vclxwindow.hxx diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/vclxwindows.hxx rename to include/toolkit/awt/vclxwindows.hxx diff --git a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/xsimpleanimation.hxx rename to include/toolkit/awt/xsimpleanimation.hxx diff --git a/toolkit/inc/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx similarity index 100% rename from toolkit/inc/toolkit/awt/xthrobber.hxx rename to include/toolkit/awt/xthrobber.hxx diff --git a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx rename to include/toolkit/controls/accessiblecontrolcontext.hxx diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/animatedimages.hxx rename to include/toolkit/controls/animatedimages.hxx diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx rename to include/toolkit/controls/controlmodelcontainerbase.hxx diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/dialogcontrol.hxx rename to include/toolkit/controls/dialogcontrol.hxx diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/eventcontainer.hxx rename to include/toolkit/controls/eventcontainer.hxx diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/formattedcontrol.hxx rename to include/toolkit/controls/formattedcontrol.hxx diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx rename to include/toolkit/controls/geometrycontrolmodel.hxx diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx rename to include/toolkit/controls/geometrycontrolmodel_impl.hxx diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/roadmapcontrol.hxx rename to include/toolkit/controls/roadmapcontrol.hxx diff --git a/toolkit/inc/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/roadmapentry.hxx rename to include/toolkit/controls/roadmapentry.hxx diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/include/toolkit/controls/spinningprogress.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/spinningprogress.hxx rename to include/toolkit/controls/spinningprogress.hxx diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/stdtabcontroller.hxx rename to include/toolkit/controls/stdtabcontroller.hxx diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx rename to include/toolkit/controls/stdtabcontrollermodel.hxx diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tabpagecontainer.hxx rename to include/toolkit/controls/tabpagecontainer.hxx diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tabpagemodel.hxx rename to include/toolkit/controls/tabpagemodel.hxx diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tkscrollbar.hxx rename to include/toolkit/controls/tkscrollbar.hxx diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tksimpleanimation.hxx rename to include/toolkit/controls/tksimpleanimation.hxx diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/include/toolkit/controls/tkspinbutton.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tkspinbutton.hxx rename to include/toolkit/controls/tkspinbutton.hxx diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/tkthrobber.hxx rename to include/toolkit/controls/tkthrobber.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrol.hxx rename to include/toolkit/controls/unocontrol.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrolbase.hxx rename to include/toolkit/controls/unocontrolbase.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrolcontainer.hxx rename to include/toolkit/controls/unocontrolcontainer.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx rename to include/toolkit/controls/unocontrolcontainermodel.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrolmodel.hxx rename to include/toolkit/controls/unocontrolmodel.hxx diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx similarity index 100% rename from toolkit/inc/toolkit/controls/unocontrols.hxx rename to include/toolkit/controls/unocontrols.hxx diff --git a/toolkit/inc/toolkit/dllapi.h b/include/toolkit/dllapi.h similarity index 100% rename from toolkit/inc/toolkit/dllapi.h rename to include/toolkit/dllapi.h diff --git a/toolkit/inc/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/accessibilityclient.hxx rename to include/toolkit/helper/accessibilityclient.hxx diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/accessiblefactory.hxx rename to include/toolkit/helper/accessiblefactory.hxx diff --git a/toolkit/inc/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/convert.hxx rename to include/toolkit/helper/convert.hxx diff --git a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx rename to include/toolkit/helper/emptyfontdescriptor.hxx diff --git a/toolkit/inc/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/externallock.hxx rename to include/toolkit/helper/externallock.hxx diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/formpdfexport.hxx rename to include/toolkit/helper/formpdfexport.hxx diff --git a/toolkit/inc/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/imagealign.hxx rename to include/toolkit/helper/imagealign.hxx diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/listenermultiplexer.hxx rename to include/toolkit/helper/listenermultiplexer.hxx diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/macros.hxx rename to include/toolkit/helper/macros.hxx diff --git a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/include/toolkit/helper/mutexandbroadcasthelper.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx rename to include/toolkit/helper/mutexandbroadcasthelper.hxx diff --git a/toolkit/inc/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/mutexhelper.hxx rename to include/toolkit/helper/mutexhelper.hxx diff --git a/toolkit/inc/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/property.hxx rename to include/toolkit/helper/property.hxx diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/servicenames.hxx rename to include/toolkit/helper/servicenames.hxx diff --git a/toolkit/inc/toolkit/helper/tkresmgr.hxx b/include/toolkit/helper/tkresmgr.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/tkresmgr.hxx rename to include/toolkit/helper/tkresmgr.hxx diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx rename to include/toolkit/helper/unopropertyarrayhelper.hxx diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/unowrapper.hxx rename to include/toolkit/helper/unowrapper.hxx diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx similarity index 100% rename from toolkit/inc/toolkit/helper/vclunohelper.hxx rename to 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 diff --git a/tools/inc/tools/StringListResource.hxx b/include/tools/StringListResource.hxx similarity index 100% rename from tools/inc/tools/StringListResource.hxx rename to include/tools/StringListResource.hxx diff --git a/tools/inc/tools/appendunixshellword.hxx b/include/tools/appendunixshellword.hxx similarity index 100% rename from tools/inc/tools/appendunixshellword.hxx rename to include/tools/appendunixshellword.hxx diff --git a/tools/inc/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx similarity index 100% rename from tools/inc/tools/b3dtrans.hxx rename to include/tools/b3dtrans.hxx diff --git a/tools/inc/tools/bigint.hxx b/include/tools/bigint.hxx similarity index 100% rename from tools/inc/tools/bigint.hxx rename to include/tools/bigint.hxx diff --git a/tools/inc/tools/cachestr.hxx b/include/tools/cachestr.hxx similarity index 100% rename from tools/inc/tools/cachestr.hxx rename to include/tools/cachestr.hxx diff --git a/tools/inc/tools/color.hxx b/include/tools/color.hxx similarity index 100% rename from tools/inc/tools/color.hxx rename to include/tools/color.hxx diff --git a/tools/inc/tools/config.hxx b/include/tools/config.hxx similarity index 100% rename from tools/inc/tools/config.hxx rename to include/tools/config.hxx diff --git a/tools/inc/tools/contnr.hxx b/include/tools/contnr.hxx similarity index 100% rename from tools/inc/tools/contnr.hxx rename to include/tools/contnr.hxx diff --git a/tools/inc/tools/date.hxx b/include/tools/date.hxx similarity index 100% rename from tools/inc/tools/date.hxx rename to include/tools/date.hxx diff --git a/tools/inc/tools/datetime.hxx b/include/tools/datetime.hxx similarity index 100% rename from tools/inc/tools/datetime.hxx rename to include/tools/datetime.hxx diff --git a/tools/inc/tools/debug.hxx b/include/tools/debug.hxx similarity index 100% rename from tools/inc/tools/debug.hxx rename to include/tools/debug.hxx diff --git a/tools/inc/tools/diagnose_ex.h b/include/tools/diagnose_ex.h similarity index 100% rename from tools/inc/tools/diagnose_ex.h rename to include/tools/diagnose_ex.h diff --git a/tools/inc/tools/errcode.hxx b/include/tools/errcode.hxx similarity index 100% rename from tools/inc/tools/errcode.hxx rename to include/tools/errcode.hxx diff --git a/tools/inc/tools/errinf.hxx b/include/tools/errinf.hxx similarity index 100% rename from tools/inc/tools/errinf.hxx rename to include/tools/errinf.hxx diff --git a/tools/inc/tools/extendapplicationenvironment.hxx b/include/tools/extendapplicationenvironment.hxx similarity index 100% rename from tools/inc/tools/extendapplicationenvironment.hxx rename to include/tools/extendapplicationenvironment.hxx diff --git a/tools/inc/tools/fldunit.hxx b/include/tools/fldunit.hxx similarity index 100% rename from tools/inc/tools/fldunit.hxx rename to include/tools/fldunit.hxx diff --git a/tools/inc/tools/fontenum.hxx b/include/tools/fontenum.hxx similarity index 100% rename from tools/inc/tools/fontenum.hxx rename to include/tools/fontenum.hxx diff --git a/tools/inc/tools/fract.hxx b/include/tools/fract.hxx similarity index 100% rename from tools/inc/tools/fract.hxx rename to include/tools/fract.hxx diff --git a/tools/inc/tools/gen.hxx b/include/tools/gen.hxx similarity index 100% rename from tools/inc/tools/gen.hxx rename to include/tools/gen.hxx diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/include/tools/getprocessworkingdir.hxx similarity index 100% rename from tools/inc/tools/getprocessworkingdir.hxx rename to include/tools/getprocessworkingdir.hxx diff --git a/tools/inc/tools/globname.hxx b/include/tools/globname.hxx similarity index 100% rename from tools/inc/tools/globname.hxx rename to include/tools/globname.hxx diff --git a/tools/inc/tools/helpers.hxx b/include/tools/helpers.hxx similarity index 100% rename from tools/inc/tools/helpers.hxx rename to include/tools/helpers.hxx diff --git a/tools/inc/tools/inetmime.hxx b/include/tools/inetmime.hxx similarity index 100% rename from tools/inc/tools/inetmime.hxx rename to include/tools/inetmime.hxx diff --git a/tools/inc/tools/inetmsg.hxx b/include/tools/inetmsg.hxx similarity index 100% rename from tools/inc/tools/inetmsg.hxx rename to include/tools/inetmsg.hxx diff --git a/tools/inc/tools/inetstrm.hxx b/include/tools/inetstrm.hxx similarity index 100% rename from tools/inc/tools/inetstrm.hxx rename to include/tools/inetstrm.hxx diff --git a/tools/inc/tools/line.hxx b/include/tools/line.hxx similarity index 100% rename from tools/inc/tools/line.hxx rename to include/tools/line.hxx diff --git a/tools/inc/tools/lineend.hxx b/include/tools/lineend.hxx similarity index 100% rename from tools/inc/tools/lineend.hxx rename to include/tools/lineend.hxx diff --git a/tools/inc/tools/link.hxx b/include/tools/link.hxx similarity index 100% rename from tools/inc/tools/link.hxx rename to include/tools/link.hxx diff --git a/tools/inc/tools/mapunit.hxx b/include/tools/mapunit.hxx similarity index 100% rename from tools/inc/tools/mapunit.hxx rename to include/tools/mapunit.hxx diff --git a/tools/inc/tools/mempool.hxx b/include/tools/mempool.hxx similarity index 100% rename from tools/inc/tools/mempool.hxx rename to include/tools/mempool.hxx diff --git a/tools/inc/tools/multisel.hxx b/include/tools/multisel.hxx similarity index 100% rename from tools/inc/tools/multisel.hxx rename to include/tools/multisel.hxx diff --git a/tools/inc/tools/pathutils.hxx b/include/tools/pathutils.hxx similarity index 100% rename from tools/inc/tools/pathutils.hxx rename to include/tools/pathutils.hxx diff --git a/tools/inc/tools/poly.hxx b/include/tools/poly.hxx similarity index 100% rename from tools/inc/tools/poly.hxx rename to include/tools/poly.hxx diff --git a/tools/inc/tools/postsys.h b/include/tools/postsys.h similarity index 100% rename from tools/inc/tools/postsys.h rename to include/tools/postsys.h diff --git a/tools/inc/tools/presys.h b/include/tools/presys.h similarity index 100% rename from tools/inc/tools/presys.h rename to include/tools/presys.h diff --git a/tools/inc/tools/pstm.hxx b/include/tools/pstm.hxx similarity index 100% rename from tools/inc/tools/pstm.hxx rename to include/tools/pstm.hxx diff --git a/tools/inc/tools/rc.h b/include/tools/rc.h similarity index 100% rename from tools/inc/tools/rc.h rename to include/tools/rc.h diff --git a/tools/inc/tools/rc.hxx b/include/tools/rc.hxx similarity index 100% rename from tools/inc/tools/rc.hxx rename to include/tools/rc.hxx diff --git a/tools/inc/tools/rcid.h b/include/tools/rcid.h similarity index 100% rename from tools/inc/tools/rcid.h rename to include/tools/rcid.h diff --git a/tools/inc/tools/ref.hxx b/include/tools/ref.hxx similarity index 100% rename from tools/inc/tools/ref.hxx rename to include/tools/ref.hxx diff --git a/tools/inc/tools/resary.hxx b/include/tools/resary.hxx similarity index 100% rename from tools/inc/tools/resary.hxx rename to include/tools/resary.hxx diff --git a/tools/inc/tools/resid.hxx b/include/tools/resid.hxx similarity index 100% rename from tools/inc/tools/resid.hxx rename to include/tools/resid.hxx diff --git a/tools/inc/tools/resmgr.hxx b/include/tools/resmgr.hxx similarity index 100% rename from tools/inc/tools/resmgr.hxx rename to include/tools/resmgr.hxx diff --git a/tools/inc/tools/rtti.hxx b/include/tools/rtti.hxx similarity index 100% rename from tools/inc/tools/rtti.hxx rename to include/tools/rtti.hxx diff --git a/tools/inc/tools/shl.hxx b/include/tools/shl.hxx similarity index 100% rename from tools/inc/tools/shl.hxx rename to include/tools/shl.hxx diff --git a/tools/inc/tools/simplerm.hxx b/include/tools/simplerm.hxx similarity index 100% rename from tools/inc/tools/simplerm.hxx rename to include/tools/simplerm.hxx diff --git a/tools/inc/tools/solar.h b/include/tools/solar.h similarity index 100% rename from tools/inc/tools/solar.h rename to include/tools/solar.h diff --git a/tools/inc/tools/solarmutex.hxx b/include/tools/solarmutex.hxx similarity index 100% rename from tools/inc/tools/solarmutex.hxx rename to include/tools/solarmutex.hxx diff --git a/tools/inc/tools/stream.hxx b/include/tools/stream.hxx similarity index 100% rename from tools/inc/tools/stream.hxx rename to include/tools/stream.hxx diff --git a/tools/inc/tools/string.hxx b/include/tools/string.hxx similarity index 100% rename from tools/inc/tools/string.hxx rename to include/tools/string.hxx diff --git a/tools/inc/tools/svborder.hxx b/include/tools/svborder.hxx similarity index 100% rename from tools/inc/tools/svborder.hxx rename to include/tools/svborder.hxx diff --git a/tools/inc/tools/tempfile.hxx b/include/tools/tempfile.hxx similarity index 100% rename from tools/inc/tools/tempfile.hxx rename to include/tools/tempfile.hxx diff --git a/tools/inc/tools/tenccvt.hxx b/include/tools/tenccvt.hxx similarity index 100% rename from tools/inc/tools/tenccvt.hxx rename to include/tools/tenccvt.hxx diff --git a/tools/inc/tools/time.hxx b/include/tools/time.hxx similarity index 100% rename from tools/inc/tools/time.hxx rename to include/tools/time.hxx diff --git a/tools/inc/tools/tools.h b/include/tools/tools.h similarity index 100% rename from tools/inc/tools/tools.h rename to include/tools/tools.h diff --git a/tools/inc/tools/toolsdllapi.h b/include/tools/toolsdllapi.h similarity index 100% rename from tools/inc/tools/toolsdllapi.h rename to include/tools/toolsdllapi.h diff --git a/tools/inc/tools/unqidx.hxx b/include/tools/unqidx.hxx similarity index 100% rename from tools/inc/tools/unqidx.hxx rename to include/tools/unqidx.hxx diff --git a/tools/inc/tools/urlobj.hxx b/include/tools/urlobj.hxx similarity index 100% rename from tools/inc/tools/urlobj.hxx rename to include/tools/urlobj.hxx diff --git a/tools/inc/tools/vcompat.hxx b/include/tools/vcompat.hxx similarity index 100% rename from tools/inc/tools/vcompat.hxx rename to include/tools/vcompat.hxx diff --git a/tools/inc/tools/vector2d.hxx b/include/tools/vector2d.hxx similarity index 100% rename from tools/inc/tools/vector2d.hxx rename to include/tools/vector2d.hxx diff --git a/tools/inc/tools/weakbase.h b/include/tools/weakbase.h similarity index 100% rename from tools/inc/tools/weakbase.h rename to include/tools/weakbase.h diff --git a/tools/inc/tools/weakbase.hxx b/include/tools/weakbase.hxx similarity index 100% rename from tools/inc/tools/weakbase.hxx rename to include/tools/weakbase.hxx diff --git a/tools/inc/tools/wintypes.hxx b/include/tools/wintypes.hxx similarity index 100% rename from tools/inc/tools/wintypes.hxx rename to include/tools/wintypes.hxx diff --git a/tools/inc/tools/wldcrd.hxx b/include/tools/wldcrd.hxx similarity index 100% rename from tools/inc/tools/wldcrd.hxx rename to include/tools/wldcrd.hxx diff --git a/tools/inc/tools/zcodec.hxx b/include/tools/zcodec.hxx similarity index 100% rename from tools/inc/tools/zcodec.hxx rename to include/tools/zcodec.hxx diff --git a/touch/inc/touch/touch.h b/include/touch/touch.h similarity index 100% rename from touch/inc/touch/touch.h rename to include/touch/touch.h diff --git a/tubes/inc/tubes/collaboration.hxx b/include/tubes/collaboration.hxx similarity index 100% rename from tubes/inc/tubes/collaboration.hxx rename to include/tubes/collaboration.hxx diff --git a/tubes/inc/tubes/conference.hxx b/include/tubes/conference.hxx similarity index 100% rename from tubes/inc/tubes/conference.hxx rename to include/tubes/conference.hxx diff --git a/tubes/inc/tubes/constants.h b/include/tubes/constants.h similarity index 100% rename from tubes/inc/tubes/constants.h rename to include/tubes/constants.h diff --git a/tubes/inc/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h similarity index 100% rename from tubes/inc/tubes/file-transfer-helper.h rename to include/tubes/file-transfer-helper.h diff --git a/tubes/inc/tubes/manager.hxx b/include/tubes/manager.hxx similarity index 100% rename from tubes/inc/tubes/manager.hxx rename to include/tubes/manager.hxx diff --git a/tubes/inc/tubes/tubesdllapi.h b/include/tubes/tubesdllapi.h similarity index 100% rename from tubes/inc/tubes/tubesdllapi.h rename to include/tubes/tubesdllapi.h diff --git a/ucbhelper/inc/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/activedatasink.hxx rename to include/ucbhelper/activedatasink.hxx diff --git a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/activedatastreamer.hxx rename to include/ucbhelper/activedatastreamer.hxx diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx rename to include/ucbhelper/cancelcommandexecution.hxx diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/commandenvironment.hxx rename to include/ucbhelper/commandenvironment.hxx diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/include/ucbhelper/content.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/content.hxx rename to include/ucbhelper/content.hxx diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/contenthelper.hxx rename to include/ucbhelper/contenthelper.hxx diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/contentidentifier.hxx rename to include/ucbhelper/contentidentifier.hxx diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/contentinfo.hxx rename to include/ucbhelper/contentinfo.hxx diff --git a/ucbhelper/inc/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/fd_inputstream.hxx rename to include/ucbhelper/fd_inputstream.hxx diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx rename to include/ucbhelper/fileidentifierconverter.hxx diff --git a/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/getcomponentcontext.hxx rename to include/ucbhelper/getcomponentcontext.hxx diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/interactionrequest.hxx rename to include/ucbhelper/interactionrequest.hxx diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/interceptedinteraction.hxx rename to include/ucbhelper/interceptedinteraction.hxx diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/macros.hxx rename to include/ucbhelper/macros.hxx diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/propertyvalueset.hxx rename to include/ucbhelper/propertyvalueset.hxx diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/providerhelper.hxx rename to include/ucbhelper/providerhelper.hxx diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/proxydecider.hxx rename to include/ucbhelper/proxydecider.hxx diff --git a/ucbhelper/inc/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/registerucb.hxx rename to include/ucbhelper/registerucb.hxx diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/resultset.hxx rename to include/ucbhelper/resultset.hxx diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/resultsethelper.hxx rename to include/ucbhelper/resultsethelper.hxx diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/resultsetmetadata.hxx rename to include/ucbhelper/resultsetmetadata.hxx diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx rename to include/ucbhelper/simpleauthenticationrequest.hxx diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx rename to include/ucbhelper/simplecertificatevalidationrequest.hxx diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx rename to include/ucbhelper/simpleinteractionrequest.hxx diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/include/ucbhelper/simpleioerrorrequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx rename to include/ucbhelper/simpleioerrorrequest.hxx diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx rename to include/ucbhelper/simplenameclashresolverequest.hxx diff --git a/ucbhelper/inc/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/std_inputstream.hxx rename to include/ucbhelper/std_inputstream.hxx diff --git a/ucbhelper/inc/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx similarity index 100% rename from ucbhelper/inc/ucbhelper/std_outputstream.hxx rename to include/ucbhelper/std_outputstream.hxx diff --git a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h similarity index 100% rename from ucbhelper/inc/ucbhelper/ucbhelperdllapi.h rename to include/ucbhelper/ucbhelperdllapi.h diff --git a/udm/inc/udm/html/htmlitem.hxx b/include/udm/html/htmlitem.hxx similarity index 100% rename from udm/inc/udm/html/htmlitem.hxx rename to include/udm/html/htmlitem.hxx diff --git a/udm/inc/udm/xml/xmlitem.hxx b/include/udm/xml/xmlitem.hxx similarity index 100% rename from udm/inc/udm/xml/xmlitem.hxx rename to include/udm/xml/xmlitem.hxx diff --git a/unoidl/inc/unoidl/detail/dllapi.hxx b/include/unoidl/detail/dllapi.hxx similarity index 100% rename from unoidl/inc/unoidl/detail/dllapi.hxx rename to include/unoidl/detail/dllapi.hxx diff --git a/unoidl/inc/unoidl/detail/unoidldllapi.hxx b/include/unoidl/detail/unoidldllapi.hxx similarity index 100% rename from unoidl/inc/unoidl/detail/unoidldllapi.hxx rename to include/unoidl/detail/unoidldllapi.hxx diff --git a/unoidl/inc/unoidl/legacyprovider.hxx b/include/unoidl/legacyprovider.hxx similarity index 100% rename from unoidl/inc/unoidl/legacyprovider.hxx rename to include/unoidl/legacyprovider.hxx diff --git a/unoidl/inc/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx similarity index 100% rename from unoidl/inc/unoidl/unoidl.hxx rename to include/unoidl/unoidl.hxx diff --git a/unoidl/inc/unoidl/unoidlprovider.hxx b/include/unoidl/unoidlprovider.hxx similarity index 100% rename from unoidl/inc/unoidl/unoidlprovider.hxx rename to include/unoidl/unoidlprovider.hxx diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx similarity index 100% rename from unotest/inc/unotest/bootstrapfixturebase.hxx rename to include/unotest/bootstrapfixturebase.hxx diff --git a/unotest/inc/unotest/detail/unotestdllapi.hxx b/include/unotest/detail/unotestdllapi.hxx similarity index 100% rename from unotest/inc/unotest/detail/unotestdllapi.hxx rename to include/unotest/detail/unotestdllapi.hxx diff --git a/unotest/inc/unotest/filters-test.hxx b/include/unotest/filters-test.hxx similarity index 100% rename from unotest/inc/unotest/filters-test.hxx rename to include/unotest/filters-test.hxx diff --git a/unotest/inc/unotest/gettestargument.hxx b/include/unotest/gettestargument.hxx similarity index 100% rename from unotest/inc/unotest/gettestargument.hxx rename to include/unotest/gettestargument.hxx diff --git a/unotest/inc/unotest/macros_test.hxx b/include/unotest/macros_test.hxx similarity index 100% rename from unotest/inc/unotest/macros_test.hxx rename to include/unotest/macros_test.hxx diff --git a/unotest/inc/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx similarity index 100% rename from unotest/inc/unotest/officeconnection.hxx rename to include/unotest/officeconnection.hxx diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/include/unotest/toabsolutefileurl.hxx similarity index 100% rename from unotest/inc/unotest/toabsolutefileurl.hxx rename to include/unotest/toabsolutefileurl.hxx diff --git a/unotest/inc/unotest/uniquepipename.hxx b/include/unotest/uniquepipename.hxx similarity index 100% rename from unotest/inc/unotest/uniquepipename.hxx rename to include/unotest/uniquepipename.hxx diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx similarity index 100% rename from unotools/inc/unotools/accessiblerelationsethelper.hxx rename to include/unotools/accessiblerelationsethelper.hxx diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx similarity index 100% rename from unotools/inc/unotools/accessiblestatesethelper.hxx rename to include/unotools/accessiblestatesethelper.hxx diff --git a/unotools/inc/unotools/atom.hxx b/include/unotools/atom.hxx similarity index 100% rename from unotools/inc/unotools/atom.hxx rename to include/unotools/atom.hxx diff --git a/unotools/inc/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx similarity index 100% rename from unotools/inc/unotools/bootstrap.hxx rename to include/unotools/bootstrap.hxx diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx similarity index 100% rename from unotools/inc/unotools/calendarwrapper.hxx rename to include/unotools/calendarwrapper.hxx diff --git a/unotools/inc/unotools/caserotate.hxx b/include/unotools/caserotate.hxx similarity index 100% rename from unotools/inc/unotools/caserotate.hxx rename to include/unotools/caserotate.hxx diff --git a/unotools/inc/unotools/charclass.hxx b/include/unotools/charclass.hxx similarity index 100% rename from unotools/inc/unotools/charclass.hxx rename to include/unotools/charclass.hxx diff --git a/unotools/inc/unotools/closeveto.hxx b/include/unotools/closeveto.hxx similarity index 100% rename from unotools/inc/unotools/closeveto.hxx rename to include/unotools/closeveto.hxx diff --git a/unotools/inc/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx similarity index 100% rename from unotools/inc/unotools/cmdoptions.hxx rename to include/unotools/cmdoptions.hxx diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx similarity index 100% rename from unotools/inc/unotools/collatorwrapper.hxx rename to include/unotools/collatorwrapper.hxx diff --git a/unotools/inc/unotools/compatibility.hxx b/include/unotools/compatibility.hxx similarity index 100% rename from unotools/inc/unotools/compatibility.hxx rename to include/unotools/compatibility.hxx diff --git a/unotools/inc/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx similarity index 100% rename from unotools/inc/unotools/componentresmodule.hxx rename to include/unotools/componentresmodule.hxx diff --git a/unotools/inc/unotools/configitem.hxx b/include/unotools/configitem.hxx similarity index 100% rename from unotools/inc/unotools/configitem.hxx rename to include/unotools/configitem.hxx diff --git a/unotools/inc/unotools/configmgr.hxx b/include/unotools/configmgr.hxx similarity index 100% rename from unotools/inc/unotools/configmgr.hxx rename to include/unotools/configmgr.hxx diff --git a/unotools/inc/unotools/confignode.hxx b/include/unotools/confignode.hxx similarity index 100% rename from unotools/inc/unotools/confignode.hxx rename to include/unotools/confignode.hxx diff --git a/unotools/inc/unotools/configpaths.hxx b/include/unotools/configpaths.hxx similarity index 100% rename from unotools/inc/unotools/configpaths.hxx rename to include/unotools/configpaths.hxx diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx similarity index 100% rename from unotools/inc/unotools/configvaluecontainer.hxx rename to include/unotools/configvaluecontainer.hxx diff --git a/unotools/inc/unotools/datetime.hxx b/include/unotools/datetime.hxx similarity index 100% rename from unotools/inc/unotools/datetime.hxx rename to include/unotools/datetime.hxx diff --git a/unotools/inc/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx similarity index 100% rename from unotools/inc/unotools/defaultoptions.hxx rename to include/unotools/defaultoptions.hxx diff --git a/unotools/inc/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx similarity index 100% rename from unotools/inc/unotools/desktopterminationobserver.hxx rename to include/unotools/desktopterminationobserver.hxx diff --git a/unotools/inc/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx similarity index 100% rename from unotools/inc/unotools/digitgroupingiterator.hxx rename to include/unotools/digitgroupingiterator.hxx diff --git a/unotools/inc/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx similarity index 100% rename from unotools/inc/unotools/docinfohelper.hxx rename to include/unotools/docinfohelper.hxx diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx similarity index 100% rename from unotools/inc/unotools/dynamicmenuoptions.hxx rename to include/unotools/dynamicmenuoptions.hxx diff --git a/unotools/inc/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx similarity index 100% rename from unotools/inc/unotools/eventcfg.hxx rename to include/unotools/eventcfg.hxx diff --git a/unotools/inc/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx similarity index 100% rename from unotools/inc/unotools/eventlisteneradapter.hxx rename to include/unotools/eventlisteneradapter.hxx diff --git a/unotools/inc/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx similarity index 100% rename from unotools/inc/unotools/extendedsecurityoptions.hxx rename to include/unotools/extendedsecurityoptions.hxx diff --git a/unotools/inc/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx similarity index 100% rename from unotools/inc/unotools/fltrcfg.hxx rename to include/unotools/fltrcfg.hxx diff --git a/unotools/inc/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx similarity index 100% rename from unotools/inc/unotools/fontcfg.hxx rename to include/unotools/fontcfg.hxx diff --git a/unotools/inc/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx similarity index 100% rename from unotools/inc/unotools/fontcvt.hxx rename to include/unotools/fontcvt.hxx diff --git a/unotools/inc/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx similarity index 100% rename from unotools/inc/unotools/fontdefs.hxx rename to include/unotools/fontdefs.hxx diff --git a/unotools/inc/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx similarity index 100% rename from unotools/inc/unotools/fontoptions.hxx rename to include/unotools/fontoptions.hxx diff --git a/unotools/inc/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx similarity index 100% rename from unotools/inc/unotools/historyoptions.hxx rename to include/unotools/historyoptions.hxx diff --git a/unotools/inc/unotools/idhelper.hxx b/include/unotools/idhelper.hxx similarity index 100% rename from unotools/inc/unotools/idhelper.hxx rename to include/unotools/idhelper.hxx diff --git a/unotools/inc/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx similarity index 100% rename from unotools/inc/unotools/intlwrapper.hxx rename to include/unotools/intlwrapper.hxx diff --git a/unotools/inc/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx similarity index 100% rename from unotools/inc/unotools/itemholderbase.hxx rename to include/unotools/itemholderbase.hxx diff --git a/unotools/inc/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx similarity index 100% rename from unotools/inc/unotools/lingucfg.hxx rename to include/unotools/lingucfg.hxx diff --git a/unotools/inc/unotools/linguprops.hxx b/include/unotools/linguprops.hxx similarity index 100% rename from unotools/inc/unotools/linguprops.hxx rename to include/unotools/linguprops.hxx diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx similarity index 100% rename from unotools/inc/unotools/localedatawrapper.hxx rename to include/unotools/localedatawrapper.hxx diff --git a/unotools/inc/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx similarity index 100% rename from unotools/inc/unotools/localfilehelper.hxx rename to include/unotools/localfilehelper.hxx diff --git a/unotools/inc/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx similarity index 100% rename from unotools/inc/unotools/localisationoptions.hxx rename to include/unotools/localisationoptions.hxx diff --git a/unotools/inc/unotools/misccfg.hxx b/include/unotools/misccfg.hxx similarity index 100% rename from unotools/inc/unotools/misccfg.hxx rename to include/unotools/misccfg.hxx diff --git a/unotools/inc/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx similarity index 100% rename from unotools/inc/unotools/moduleoptions.hxx rename to include/unotools/moduleoptions.hxx diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx similarity index 100% rename from unotools/inc/unotools/nativenumberwrapper.hxx rename to include/unotools/nativenumberwrapper.hxx diff --git a/unotools/inc/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx similarity index 100% rename from unotools/inc/unotools/numberformatcodewrapper.hxx rename to include/unotools/numberformatcodewrapper.hxx diff --git a/unotools/inc/unotools/options.hxx b/include/unotools/options.hxx similarity index 100% rename from unotools/inc/unotools/options.hxx rename to include/unotools/options.hxx diff --git a/unotools/inc/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx similarity index 100% rename from unotools/inc/unotools/optionsdlg.hxx rename to include/unotools/optionsdlg.hxx diff --git a/unotools/inc/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx similarity index 100% rename from unotools/inc/unotools/pathoptions.hxx rename to include/unotools/pathoptions.hxx diff --git a/unotools/inc/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx similarity index 100% rename from unotools/inc/unotools/printwarningoptions.hxx rename to include/unotools/printwarningoptions.hxx diff --git a/unotools/inc/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx similarity index 100% rename from unotools/inc/unotools/progresshandlerwrap.hxx rename to include/unotools/progresshandlerwrap.hxx diff --git a/unotools/inc/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx similarity index 100% rename from unotools/inc/unotools/readwritemutexguard.hxx rename to include/unotools/readwritemutexguard.hxx diff --git a/unotools/inc/unotools/saveopt.hxx b/include/unotools/saveopt.hxx similarity index 100% rename from unotools/inc/unotools/saveopt.hxx rename to include/unotools/saveopt.hxx diff --git a/unotools/inc/unotools/searchopt.hxx b/include/unotools/searchopt.hxx similarity index 100% rename from unotools/inc/unotools/searchopt.hxx rename to include/unotools/searchopt.hxx diff --git a/unotools/inc/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx similarity index 100% rename from unotools/inc/unotools/securityoptions.hxx rename to include/unotools/securityoptions.hxx diff --git a/unotools/inc/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx similarity index 100% rename from unotools/inc/unotools/sharedunocomponent.hxx rename to include/unotools/sharedunocomponent.hxx diff --git a/unotools/inc/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx similarity index 100% rename from unotools/inc/unotools/streamhelper.hxx rename to include/unotools/streamhelper.hxx diff --git a/unotools/inc/unotools/streamsection.hxx b/include/unotools/streamsection.hxx similarity index 100% rename from unotools/inc/unotools/streamsection.hxx rename to include/unotools/streamsection.hxx diff --git a/unotools/inc/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx similarity index 100% rename from unotools/inc/unotools/streamwrap.hxx rename to include/unotools/streamwrap.hxx diff --git a/unotools/inc/unotools/syslocale.hxx b/include/unotools/syslocale.hxx similarity index 100% rename from unotools/inc/unotools/syslocale.hxx rename to include/unotools/syslocale.hxx diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx similarity index 100% rename from unotools/inc/unotools/syslocaleoptions.hxx rename to include/unotools/syslocaleoptions.hxx diff --git a/unotools/inc/unotools/tempfile.hxx b/include/unotools/tempfile.hxx similarity index 100% rename from unotools/inc/unotools/tempfile.hxx rename to include/unotools/tempfile.hxx diff --git a/unotools/inc/unotools/textsearch.hxx b/include/unotools/textsearch.hxx similarity index 100% rename from unotools/inc/unotools/textsearch.hxx rename to include/unotools/textsearch.hxx diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx similarity index 100% rename from unotools/inc/unotools/transliterationwrapper.hxx rename to include/unotools/transliterationwrapper.hxx diff --git a/unotools/inc/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx similarity index 100% rename from unotools/inc/unotools/ucbhelper.hxx rename to include/unotools/ucbhelper.hxx diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx similarity index 100% rename from unotools/inc/unotools/ucblockbytes.hxx rename to include/unotools/ucblockbytes.hxx diff --git a/unotools/inc/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx similarity index 100% rename from unotools/inc/unotools/ucbstreamhelper.hxx rename to include/unotools/ucbstreamhelper.hxx diff --git a/unotools/inc/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h similarity index 100% rename from unotools/inc/unotools/unotoolsdllapi.h rename to include/unotools/unotoolsdllapi.h diff --git a/unotools/inc/unotools/useroptions.hxx b/include/unotools/useroptions.hxx similarity index 100% rename from unotools/inc/unotools/useroptions.hxx rename to include/unotools/useroptions.hxx diff --git a/unotools/inc/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx similarity index 100% rename from unotools/inc/unotools/viewoptions.hxx rename to include/unotools/viewoptions.hxx diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx similarity index 100% rename from unotools/inc/unotools/xmlaccelcfg.hxx rename to include/unotools/xmlaccelcfg.hxx diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/include/vbahelper/helperdecl.hxx similarity index 100% rename from vbahelper/inc/vbahelper/helperdecl.hxx rename to include/vbahelper/helperdecl.hxx diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbaaccesshelper.hxx rename to include/vbahelper/vbaaccesshelper.hxx diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbaapplicationbase.hxx rename to include/vbahelper/vbaapplicationbase.hxx diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbacollectionimpl.hxx rename to include/vbahelper/vbacollectionimpl.hxx diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbadialogbase.hxx rename to include/vbahelper/vbadialogbase.hxx diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbadialogsbase.hxx rename to include/vbahelper/vbadialogsbase.hxx diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h similarity index 100% rename from vbahelper/inc/vbahelper/vbadllapi.h rename to include/vbahelper/vbadllapi.h diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbadocumentbase.hxx rename to include/vbahelper/vbadocumentbase.hxx diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbadocumentsbase.hxx rename to include/vbahelper/vbadocumentsbase.hxx diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbaeventshelperbase.hxx rename to include/vbahelper/vbaeventshelperbase.hxx diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbafontbase.hxx rename to include/vbahelper/vbafontbase.hxx diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbaglobalbase.hxx rename to include/vbahelper/vbaglobalbase.hxx diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbahelper.hxx rename to include/vbahelper/vbahelper.hxx diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbahelperinterface.hxx rename to include/vbahelper/vbahelperinterface.hxx diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbapagesetupbase.hxx rename to include/vbahelper/vbapagesetupbase.hxx diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbapropvalue.hxx rename to include/vbahelper/vbapropvalue.hxx diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbashape.hxx rename to include/vbahelper/vbashape.hxx diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbashaperange.hxx rename to include/vbahelper/vbashaperange.hxx diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbashapes.hxx rename to include/vbahelper/vbashapes.hxx diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbatextframe.hxx rename to include/vbahelper/vbatextframe.hxx diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx similarity index 100% rename from vbahelper/inc/vbahelper/vbawindowbase.hxx rename to include/vbahelper/vbawindowbase.hxx diff --git a/vcl/inc/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx similarity index 100% rename from vcl/inc/vcl/FilterConfigItem.hxx rename to include/vcl/FilterConfigItem.hxx diff --git a/vcl/inc/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx similarity index 100% rename from vcl/inc/vcl/GraphicNativeMetadata.hxx rename to include/vcl/GraphicNativeMetadata.hxx diff --git a/vcl/inc/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx similarity index 100% rename from vcl/inc/vcl/GraphicNativeTransform.hxx rename to include/vcl/GraphicNativeTransform.hxx diff --git a/vcl/inc/vcl/ImageListProvider.hxx b/include/vcl/ImageListProvider.hxx similarity index 100% rename from vcl/inc/vcl/ImageListProvider.hxx rename to include/vcl/ImageListProvider.hxx diff --git a/vcl/inc/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx similarity index 100% rename from vcl/inc/vcl/abstdlg.hxx rename to include/vcl/abstdlg.hxx diff --git a/vcl/inc/vcl/accel.hxx b/include/vcl/accel.hxx similarity index 100% rename from vcl/inc/vcl/accel.hxx rename to include/vcl/accel.hxx diff --git a/vcl/inc/vcl/alpha.hxx b/include/vcl/alpha.hxx similarity index 100% rename from vcl/inc/vcl/alpha.hxx rename to include/vcl/alpha.hxx diff --git a/vcl/inc/vcl/animate.hxx b/include/vcl/animate.hxx similarity index 100% rename from vcl/inc/vcl/animate.hxx rename to include/vcl/animate.hxx diff --git a/vcl/inc/vcl/apptypes.hxx b/include/vcl/apptypes.hxx similarity index 100% rename from vcl/inc/vcl/apptypes.hxx rename to include/vcl/apptypes.hxx diff --git a/vcl/inc/vcl/bitmap.hxx b/include/vcl/bitmap.hxx similarity index 100% rename from vcl/inc/vcl/bitmap.hxx rename to include/vcl/bitmap.hxx diff --git a/vcl/inc/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx similarity index 100% rename from vcl/inc/vcl/bitmapex.hxx rename to include/vcl/bitmapex.hxx diff --git a/vcl/inc/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx similarity index 100% rename from vcl/inc/vcl/bmpacc.hxx rename to include/vcl/bmpacc.hxx diff --git a/vcl/inc/vcl/btndlg.hxx b/include/vcl/btndlg.hxx similarity index 100% rename from vcl/inc/vcl/btndlg.hxx rename to include/vcl/btndlg.hxx diff --git a/vcl/inc/vcl/builder.hxx b/include/vcl/builder.hxx similarity index 100% rename from vcl/inc/vcl/builder.hxx rename to include/vcl/builder.hxx diff --git a/vcl/inc/vcl/button.hxx b/include/vcl/button.hxx similarity index 100% rename from vcl/inc/vcl/button.hxx rename to include/vcl/button.hxx diff --git a/vcl/inc/vcl/canvastools.hxx b/include/vcl/canvastools.hxx similarity index 100% rename from vcl/inc/vcl/canvastools.hxx rename to include/vcl/canvastools.hxx diff --git a/vcl/inc/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx similarity index 100% rename from vcl/inc/vcl/cmdevt.hxx rename to include/vcl/cmdevt.hxx diff --git a/vcl/inc/vcl/combobox.h b/include/vcl/combobox.h similarity index 100% rename from vcl/inc/vcl/combobox.h rename to include/vcl/combobox.h diff --git a/vcl/inc/vcl/combobox.hxx b/include/vcl/combobox.hxx similarity index 100% rename from vcl/inc/vcl/combobox.hxx rename to include/vcl/combobox.hxx diff --git a/vcl/inc/vcl/configsettings.hxx b/include/vcl/configsettings.hxx similarity index 100% rename from vcl/inc/vcl/configsettings.hxx rename to include/vcl/configsettings.hxx diff --git a/vcl/inc/vcl/controllayout.hxx b/include/vcl/controllayout.hxx similarity index 100% rename from vcl/inc/vcl/controllayout.hxx rename to include/vcl/controllayout.hxx diff --git a/vcl/inc/vcl/ctrl.hxx b/include/vcl/ctrl.hxx similarity index 100% rename from vcl/inc/vcl/ctrl.hxx rename to include/vcl/ctrl.hxx diff --git a/vcl/inc/vcl/cursor.hxx b/include/vcl/cursor.hxx similarity index 100% rename from vcl/inc/vcl/cursor.hxx rename to include/vcl/cursor.hxx diff --git a/vcl/inc/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx similarity index 100% rename from vcl/inc/vcl/cvtgrf.hxx rename to include/vcl/cvtgrf.hxx diff --git a/vcl/inc/vcl/cvtsvm.hxx b/include/vcl/cvtsvm.hxx similarity index 100% rename from vcl/inc/vcl/cvtsvm.hxx rename to include/vcl/cvtsvm.hxx diff --git a/vcl/inc/vcl/decoview.hxx b/include/vcl/decoview.hxx similarity index 100% rename from vcl/inc/vcl/decoview.hxx rename to include/vcl/decoview.hxx diff --git a/vcl/inc/vcl/dialog.hxx b/include/vcl/dialog.hxx similarity index 100% rename from vcl/inc/vcl/dialog.hxx rename to include/vcl/dialog.hxx diff --git a/vcl/inc/vcl/displayconnectiondispatch.hxx b/include/vcl/displayconnectiondispatch.hxx similarity index 100% rename from vcl/inc/vcl/displayconnectiondispatch.hxx rename to include/vcl/displayconnectiondispatch.hxx diff --git a/vcl/inc/vcl/dllapi.h b/include/vcl/dllapi.h similarity index 100% rename from vcl/inc/vcl/dllapi.h rename to include/vcl/dllapi.h diff --git a/vcl/inc/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx similarity index 100% rename from vcl/inc/vcl/dndhelp.hxx rename to include/vcl/dndhelp.hxx diff --git a/vcl/inc/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx similarity index 100% rename from vcl/inc/vcl/dockingarea.hxx rename to include/vcl/dockingarea.hxx diff --git a/vcl/inc/vcl/dockwin.hxx b/include/vcl/dockwin.hxx similarity index 100% rename from vcl/inc/vcl/dockwin.hxx rename to include/vcl/dockwin.hxx diff --git a/vcl/inc/vcl/edit.hxx b/include/vcl/edit.hxx similarity index 100% rename from vcl/inc/vcl/edit.hxx rename to include/vcl/edit.hxx diff --git a/vcl/inc/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx similarity index 100% rename from vcl/inc/vcl/embeddedfontshelper.hxx rename to include/vcl/embeddedfontshelper.hxx diff --git a/vcl/inc/vcl/event.hxx b/include/vcl/event.hxx similarity index 100% rename from vcl/inc/vcl/event.hxx rename to include/vcl/event.hxx diff --git a/vcl/inc/vcl/evntpost.hxx b/include/vcl/evntpost.hxx similarity index 100% rename from vcl/inc/vcl/evntpost.hxx rename to include/vcl/evntpost.hxx diff --git a/vcl/inc/vcl/extoutdevdata.hxx b/include/vcl/extoutdevdata.hxx similarity index 100% rename from vcl/inc/vcl/extoutdevdata.hxx rename to include/vcl/extoutdevdata.hxx diff --git a/vcl/inc/vcl/field.hxx b/include/vcl/field.hxx similarity index 100% rename from vcl/inc/vcl/field.hxx rename to include/vcl/field.hxx diff --git a/vcl/inc/vcl/fixed.hxx b/include/vcl/fixed.hxx similarity index 100% rename from vcl/inc/vcl/fixed.hxx rename to include/vcl/fixed.hxx diff --git a/vcl/inc/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx similarity index 100% rename from vcl/inc/vcl/fixedhyper.hxx rename to include/vcl/fixedhyper.hxx diff --git a/vcl/inc/vcl/floatwin.hxx b/include/vcl/floatwin.hxx similarity index 100% rename from vcl/inc/vcl/floatwin.hxx rename to include/vcl/floatwin.hxx diff --git a/vcl/inc/vcl/fltcall.hxx b/include/vcl/fltcall.hxx similarity index 100% rename from vcl/inc/vcl/fltcall.hxx rename to include/vcl/fltcall.hxx diff --git a/vcl/inc/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx similarity index 100% rename from vcl/inc/vcl/fntstyle.hxx rename to include/vcl/fntstyle.hxx diff --git a/vcl/inc/vcl/font.hxx b/include/vcl/font.hxx similarity index 100% rename from vcl/inc/vcl/font.hxx rename to include/vcl/font.hxx diff --git a/vcl/inc/vcl/fontcapabilities.hxx b/include/vcl/fontcapabilities.hxx similarity index 100% rename from vcl/inc/vcl/fontcapabilities.hxx rename to include/vcl/fontcapabilities.hxx diff --git a/vcl/inc/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx similarity index 100% rename from vcl/inc/vcl/fontmanager.hxx rename to include/vcl/fontmanager.hxx diff --git a/vcl/inc/vcl/fpicker.hrc b/include/vcl/fpicker.hrc similarity index 100% rename from vcl/inc/vcl/fpicker.hrc rename to include/vcl/fpicker.hrc diff --git a/vcl/inc/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx similarity index 100% rename from vcl/inc/vcl/gdimtf.hxx rename to include/vcl/gdimtf.hxx diff --git a/vcl/inc/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx similarity index 100% rename from vcl/inc/vcl/gfxlink.hxx rename to include/vcl/gfxlink.hxx diff --git a/vcl/inc/vcl/gradient.hxx b/include/vcl/gradient.hxx similarity index 100% rename from vcl/inc/vcl/gradient.hxx rename to include/vcl/gradient.hxx diff --git a/vcl/inc/vcl/graph.h b/include/vcl/graph.h similarity index 100% rename from vcl/inc/vcl/graph.h rename to include/vcl/graph.h diff --git a/vcl/inc/vcl/graph.hxx b/include/vcl/graph.hxx similarity index 100% rename from vcl/inc/vcl/graph.hxx rename to include/vcl/graph.hxx diff --git a/vcl/inc/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx similarity index 100% rename from vcl/inc/vcl/graphicfilter.hxx rename to include/vcl/graphicfilter.hxx diff --git a/vcl/inc/vcl/graphictools.hxx b/include/vcl/graphictools.hxx similarity index 100% rename from vcl/inc/vcl/graphictools.hxx rename to include/vcl/graphictools.hxx diff --git a/vcl/inc/vcl/group.hxx b/include/vcl/group.hxx similarity index 100% rename from vcl/inc/vcl/group.hxx rename to include/vcl/group.hxx diff --git a/vcl/inc/vcl/hatch.hxx b/include/vcl/hatch.hxx similarity index 100% rename from vcl/inc/vcl/hatch.hxx rename to include/vcl/hatch.hxx diff --git a/vcl/inc/vcl/help.hxx b/include/vcl/help.hxx similarity index 100% rename from vcl/inc/vcl/help.hxx rename to include/vcl/help.hxx diff --git a/vcl/inc/vcl/helper.hxx b/include/vcl/helper.hxx similarity index 100% rename from vcl/inc/vcl/helper.hxx rename to include/vcl/helper.hxx diff --git a/vcl/inc/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx similarity index 100% rename from vcl/inc/vcl/i18nhelp.hxx rename to include/vcl/i18nhelp.hxx diff --git a/vcl/inc/vcl/image.hxx b/include/vcl/image.hxx similarity index 100% rename from vcl/inc/vcl/image.hxx rename to include/vcl/image.hxx diff --git a/vcl/inc/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx similarity index 100% rename from vcl/inc/vcl/imagerepository.hxx rename to include/vcl/imagerepository.hxx diff --git a/vcl/inc/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx similarity index 100% rename from vcl/inc/vcl/imgctrl.hxx rename to include/vcl/imgctrl.hxx diff --git a/vcl/inc/vcl/impdel.hxx b/include/vcl/impdel.hxx similarity index 100% rename from vcl/inc/vcl/impdel.hxx rename to include/vcl/impdel.hxx diff --git a/vcl/inc/vcl/inputctx.hxx b/include/vcl/inputctx.hxx similarity index 100% rename from vcl/inc/vcl/inputctx.hxx rename to include/vcl/inputctx.hxx diff --git a/vcl/inc/vcl/introwin.hxx b/include/vcl/introwin.hxx similarity index 100% rename from vcl/inc/vcl/introwin.hxx rename to include/vcl/introwin.hxx diff --git a/vcl/inc/vcl/jobdata.hxx b/include/vcl/jobdata.hxx similarity index 100% rename from vcl/inc/vcl/jobdata.hxx rename to include/vcl/jobdata.hxx diff --git a/vcl/inc/vcl/jobset.hxx b/include/vcl/jobset.hxx similarity index 100% rename from vcl/inc/vcl/jobset.hxx rename to include/vcl/jobset.hxx diff --git a/vcl/inc/vcl/keycod.hxx b/include/vcl/keycod.hxx similarity index 100% rename from vcl/inc/vcl/keycod.hxx rename to include/vcl/keycod.hxx diff --git a/vcl/inc/vcl/keycodes.hxx b/include/vcl/keycodes.hxx similarity index 100% rename from vcl/inc/vcl/keycodes.hxx rename to include/vcl/keycodes.hxx diff --git a/vcl/inc/vcl/layout.hxx b/include/vcl/layout.hxx similarity index 100% rename from vcl/inc/vcl/layout.hxx rename to include/vcl/layout.hxx diff --git a/vcl/inc/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx similarity index 100% rename from vcl/inc/vcl/lazydelete.hxx rename to include/vcl/lazydelete.hxx diff --git a/vcl/inc/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx similarity index 100% rename from vcl/inc/vcl/lineinfo.hxx rename to include/vcl/lineinfo.hxx diff --git a/vcl/inc/vcl/longcurr.hxx b/include/vcl/longcurr.hxx similarity index 100% rename from vcl/inc/vcl/longcurr.hxx rename to include/vcl/longcurr.hxx diff --git a/vcl/inc/vcl/lstbox.h b/include/vcl/lstbox.h similarity index 100% rename from vcl/inc/vcl/lstbox.h rename to include/vcl/lstbox.h diff --git a/vcl/inc/vcl/lstbox.hxx b/include/vcl/lstbox.hxx similarity index 100% rename from vcl/inc/vcl/lstbox.hxx rename to include/vcl/lstbox.hxx diff --git a/vcl/inc/vcl/mapmod.hxx b/include/vcl/mapmod.hxx similarity index 100% rename from vcl/inc/vcl/mapmod.hxx rename to include/vcl/mapmod.hxx diff --git a/vcl/inc/vcl/menu.hxx b/include/vcl/menu.hxx similarity index 100% rename from vcl/inc/vcl/menu.hxx rename to include/vcl/menu.hxx diff --git a/vcl/inc/vcl/menubtn.hxx b/include/vcl/menubtn.hxx similarity index 100% rename from vcl/inc/vcl/menubtn.hxx rename to include/vcl/menubtn.hxx diff --git a/vcl/inc/vcl/metaact.hxx b/include/vcl/metaact.hxx similarity index 100% rename from vcl/inc/vcl/metaact.hxx rename to include/vcl/metaact.hxx diff --git a/vcl/inc/vcl/metric.hxx b/include/vcl/metric.hxx similarity index 100% rename from vcl/inc/vcl/metric.hxx rename to include/vcl/metric.hxx diff --git a/vcl/inc/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx similarity index 100% rename from vcl/inc/vcl/mnemonic.hxx rename to include/vcl/mnemonic.hxx diff --git a/vcl/inc/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx similarity index 100% rename from vcl/inc/vcl/mnemonicengine.hxx rename to include/vcl/mnemonicengine.hxx diff --git a/vcl/inc/vcl/morebtn.hxx b/include/vcl/morebtn.hxx similarity index 100% rename from vcl/inc/vcl/morebtn.hxx rename to include/vcl/morebtn.hxx diff --git a/vcl/inc/vcl/msgbox.hxx b/include/vcl/msgbox.hxx similarity index 100% rename from vcl/inc/vcl/msgbox.hxx rename to include/vcl/msgbox.hxx diff --git a/vcl/inc/vcl/octree.hxx b/include/vcl/octree.hxx similarity index 100% rename from vcl/inc/vcl/octree.hxx rename to include/vcl/octree.hxx diff --git a/vcl/inc/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx similarity index 100% rename from vcl/inc/vcl/oldprintadaptor.hxx rename to include/vcl/oldprintadaptor.hxx diff --git a/vcl/inc/vcl/outdev.hxx b/include/vcl/outdev.hxx similarity index 100% rename from vcl/inc/vcl/outdev.hxx rename to include/vcl/outdev.hxx diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx similarity index 100% rename from vcl/inc/vcl/pdfextoutdevdata.hxx rename to include/vcl/pdfextoutdevdata.hxx diff --git a/vcl/inc/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx similarity index 100% rename from vcl/inc/vcl/pdfwriter.hxx rename to include/vcl/pdfwriter.hxx diff --git a/vcl/inc/vcl/pngread.hxx b/include/vcl/pngread.hxx similarity index 100% rename from vcl/inc/vcl/pngread.hxx rename to include/vcl/pngread.hxx diff --git a/vcl/inc/vcl/pngwrite.hxx b/include/vcl/pngwrite.hxx similarity index 100% rename from vcl/inc/vcl/pngwrite.hxx rename to include/vcl/pngwrite.hxx diff --git a/vcl/inc/vcl/pointr.hxx b/include/vcl/pointr.hxx similarity index 100% rename from vcl/inc/vcl/pointr.hxx rename to include/vcl/pointr.hxx diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx similarity index 100% rename from vcl/inc/vcl/popupmenuwindow.hxx rename to include/vcl/popupmenuwindow.hxx diff --git a/vcl/inc/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx similarity index 100% rename from vcl/inc/vcl/ppdparser.hxx rename to include/vcl/ppdparser.hxx diff --git a/vcl/inc/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx similarity index 100% rename from vcl/inc/vcl/prgsbar.hxx rename to include/vcl/prgsbar.hxx diff --git a/vcl/inc/vcl/print.hxx b/include/vcl/print.hxx similarity index 100% rename from vcl/inc/vcl/print.hxx rename to include/vcl/print.hxx diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx similarity index 100% rename from vcl/inc/vcl/printerinfomanager.hxx rename to include/vcl/printerinfomanager.hxx diff --git a/vcl/inc/vcl/prntypes.hxx b/include/vcl/prntypes.hxx similarity index 100% rename from vcl/inc/vcl/prntypes.hxx rename to include/vcl/prntypes.hxx diff --git a/vcl/inc/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx similarity index 100% rename from vcl/inc/vcl/ptrstyle.hxx rename to include/vcl/ptrstyle.hxx diff --git a/vcl/inc/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx similarity index 100% rename from vcl/inc/vcl/quickselectionengine.hxx rename to include/vcl/quickselectionengine.hxx diff --git a/vcl/inc/vcl/regband.hxx b/include/vcl/regband.hxx similarity index 100% rename from vcl/inc/vcl/regband.hxx rename to include/vcl/regband.hxx diff --git a/vcl/inc/vcl/region.hxx b/include/vcl/region.hxx similarity index 100% rename from vcl/inc/vcl/region.hxx rename to include/vcl/region.hxx diff --git a/vcl/inc/vcl/salbtype.hxx b/include/vcl/salbtype.hxx similarity index 100% rename from vcl/inc/vcl/salbtype.hxx rename to include/vcl/salbtype.hxx diff --git a/vcl/inc/vcl/salctype.hxx b/include/vcl/salctype.hxx similarity index 100% rename from vcl/inc/vcl/salctype.hxx rename to include/vcl/salctype.hxx diff --git a/vcl/inc/vcl/salgtype.hxx b/include/vcl/salgtype.hxx similarity index 100% rename from vcl/inc/vcl/salgtype.hxx rename to include/vcl/salgtype.hxx diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx similarity index 100% rename from vcl/inc/vcl/salnativewidgets.hxx rename to include/vcl/salnativewidgets.hxx diff --git a/vcl/inc/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx similarity index 100% rename from vcl/inc/vcl/scopedbitmapaccess.hxx rename to include/vcl/scopedbitmapaccess.hxx diff --git a/vcl/inc/vcl/scrbar.hxx b/include/vcl/scrbar.hxx similarity index 100% rename from vcl/inc/vcl/scrbar.hxx rename to include/vcl/scrbar.hxx diff --git a/vcl/inc/vcl/seleng.hxx b/include/vcl/seleng.hxx similarity index 100% rename from vcl/inc/vcl/seleng.hxx rename to include/vcl/seleng.hxx diff --git a/vcl/inc/vcl/settings.hxx b/include/vcl/settings.hxx similarity index 100% rename from vcl/inc/vcl/settings.hxx rename to include/vcl/settings.hxx diff --git a/vcl/inc/vcl/slider.hxx b/include/vcl/slider.hxx similarity index 100% rename from vcl/inc/vcl/slider.hxx rename to include/vcl/slider.hxx diff --git a/vcl/inc/vcl/solarmutex.hxx b/include/vcl/solarmutex.hxx similarity index 100% rename from vcl/inc/vcl/solarmutex.hxx rename to include/vcl/solarmutex.hxx diff --git a/vcl/inc/vcl/sound.hxx b/include/vcl/sound.hxx similarity index 100% rename from vcl/inc/vcl/sound.hxx rename to include/vcl/sound.hxx diff --git a/vcl/inc/vcl/spin.h b/include/vcl/spin.h similarity index 100% rename from vcl/inc/vcl/spin.h rename to include/vcl/spin.h diff --git a/vcl/inc/vcl/spin.hxx b/include/vcl/spin.hxx similarity index 100% rename from vcl/inc/vcl/spin.hxx rename to include/vcl/spin.hxx diff --git a/vcl/inc/vcl/spinfld.hxx b/include/vcl/spinfld.hxx similarity index 100% rename from vcl/inc/vcl/spinfld.hxx rename to include/vcl/spinfld.hxx diff --git a/vcl/inc/vcl/split.hxx b/include/vcl/split.hxx similarity index 100% rename from vcl/inc/vcl/split.hxx rename to include/vcl/split.hxx diff --git a/vcl/inc/vcl/splitwin.hxx b/include/vcl/splitwin.hxx similarity index 100% rename from vcl/inc/vcl/splitwin.hxx rename to include/vcl/splitwin.hxx diff --git a/vcl/inc/vcl/status.hxx b/include/vcl/status.hxx similarity index 100% rename from vcl/inc/vcl/status.hxx rename to include/vcl/status.hxx diff --git a/vcl/inc/vcl/stdtext.hxx b/include/vcl/stdtext.hxx similarity index 100% rename from vcl/inc/vcl/stdtext.hxx rename to include/vcl/stdtext.hxx diff --git a/vcl/inc/vcl/strhelper.hxx b/include/vcl/strhelper.hxx similarity index 100% rename from vcl/inc/vcl/strhelper.hxx rename to include/vcl/strhelper.hxx diff --git a/vcl/inc/vcl/svapp.hxx b/include/vcl/svapp.hxx similarity index 100% rename from vcl/inc/vcl/svapp.hxx rename to include/vcl/svapp.hxx diff --git a/vcl/inc/vcl/svgdata.hxx b/include/vcl/svgdata.hxx similarity index 100% rename from vcl/inc/vcl/svgdata.hxx rename to include/vcl/svgdata.hxx diff --git a/vcl/inc/vcl/syschild.hxx b/include/vcl/syschild.hxx similarity index 100% rename from vcl/inc/vcl/syschild.hxx rename to include/vcl/syschild.hxx diff --git a/vcl/inc/vcl/sysdata.hxx b/include/vcl/sysdata.hxx similarity index 100% rename from vcl/inc/vcl/sysdata.hxx rename to include/vcl/sysdata.hxx diff --git a/vcl/inc/vcl/syswin.hxx b/include/vcl/syswin.hxx similarity index 100% rename from vcl/inc/vcl/syswin.hxx rename to include/vcl/syswin.hxx diff --git a/vcl/inc/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx similarity index 100% rename from vcl/inc/vcl/tabctrl.hxx rename to include/vcl/tabctrl.hxx diff --git a/vcl/inc/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx similarity index 100% rename from vcl/inc/vcl/tabdlg.hxx rename to include/vcl/tabdlg.hxx diff --git a/vcl/inc/vcl/tabpage.hxx b/include/vcl/tabpage.hxx similarity index 100% rename from vcl/inc/vcl/tabpage.hxx rename to include/vcl/tabpage.hxx diff --git a/vcl/inc/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx similarity index 100% rename from vcl/inc/vcl/taskpanelist.hxx rename to include/vcl/taskpanelist.hxx diff --git a/vcl/inc/vcl/textdata.hxx b/include/vcl/textdata.hxx similarity index 100% rename from vcl/inc/vcl/textdata.hxx rename to include/vcl/textdata.hxx diff --git a/vcl/inc/vcl/texteng.hxx b/include/vcl/texteng.hxx similarity index 100% rename from vcl/inc/vcl/texteng.hxx rename to include/vcl/texteng.hxx diff --git a/vcl/inc/vcl/textview.hxx b/include/vcl/textview.hxx similarity index 100% rename from vcl/inc/vcl/textview.hxx rename to include/vcl/textview.hxx diff --git a/vcl/inc/vcl/threadex.hxx b/include/vcl/threadex.hxx similarity index 100% rename from vcl/inc/vcl/threadex.hxx rename to include/vcl/threadex.hxx diff --git a/vcl/inc/vcl/throbber.hxx b/include/vcl/throbber.hxx similarity index 100% rename from vcl/inc/vcl/throbber.hxx rename to include/vcl/throbber.hxx diff --git a/vcl/inc/vcl/timer.hxx b/include/vcl/timer.hxx similarity index 100% rename from vcl/inc/vcl/timer.hxx rename to include/vcl/timer.hxx diff --git a/vcl/inc/vcl/toolbox.hxx b/include/vcl/toolbox.hxx similarity index 100% rename from vcl/inc/vcl/toolbox.hxx rename to include/vcl/toolbox.hxx diff --git a/vcl/inc/vcl/txtattr.hxx b/include/vcl/txtattr.hxx similarity index 100% rename from vcl/inc/vcl/txtattr.hxx rename to include/vcl/txtattr.hxx diff --git a/vcl/inc/vcl/unohelp.hxx b/include/vcl/unohelp.hxx similarity index 100% rename from vcl/inc/vcl/unohelp.hxx rename to include/vcl/unohelp.hxx diff --git a/vcl/inc/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx similarity index 100% rename from vcl/inc/vcl/unohelp2.hxx rename to include/vcl/unohelp2.hxx diff --git a/vcl/inc/vcl/unowrap.hxx b/include/vcl/unowrap.hxx similarity index 100% rename from vcl/inc/vcl/unowrap.hxx rename to include/vcl/unowrap.hxx diff --git a/vcl/inc/vcl/vclenum.hxx b/include/vcl/vclenum.hxx similarity index 100% rename from vcl/inc/vcl/vclenum.hxx rename to include/vcl/vclenum.hxx diff --git a/vcl/inc/vcl/vclevent.hxx b/include/vcl/vclevent.hxx similarity index 100% rename from vcl/inc/vcl/vclevent.hxx rename to include/vcl/vclevent.hxx diff --git a/vcl/inc/vcl/vclmain.hxx b/include/vcl/vclmain.hxx similarity index 100% rename from vcl/inc/vcl/vclmain.hxx rename to include/vcl/vclmain.hxx diff --git a/vcl/inc/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx similarity index 100% rename from vcl/inc/vcl/vclmedit.hxx rename to include/vcl/vclmedit.hxx diff --git a/vcl/inc/vcl/virdev.hxx b/include/vcl/virdev.hxx similarity index 100% rename from vcl/inc/vcl/virdev.hxx rename to include/vcl/virdev.hxx diff --git a/vcl/inc/vcl/waitobj.hxx b/include/vcl/waitobj.hxx similarity index 100% rename from vcl/inc/vcl/waitobj.hxx rename to include/vcl/waitobj.hxx diff --git a/vcl/inc/vcl/wall.hxx b/include/vcl/wall.hxx similarity index 100% rename from vcl/inc/vcl/wall.hxx rename to include/vcl/wall.hxx diff --git a/vcl/inc/vcl/window.hxx b/include/vcl/window.hxx similarity index 100% rename from vcl/inc/vcl/window.hxx rename to include/vcl/window.hxx diff --git a/vcl/inc/vcl/wmf.hxx b/include/vcl/wmf.hxx similarity index 100% rename from vcl/inc/vcl/wmf.hxx rename to include/vcl/wmf.hxx diff --git a/vcl/inc/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx similarity index 100% rename from vcl/inc/vcl/wrkwin.hxx rename to include/vcl/wrkwin.hxx diff --git a/vcl/inc/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx similarity index 100% rename from vcl/inc/vcl/xtextedt.hxx rename to include/vcl/xtextedt.hxx diff --git a/xmloff/inc/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/DashStyle.hxx rename to include/xmloff/DashStyle.hxx diff --git a/xmloff/inc/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx similarity index 100% rename from xmloff/inc/xmloff/DocumentSettingsContext.hxx rename to include/xmloff/DocumentSettingsContext.hxx diff --git a/xmloff/inc/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx similarity index 100% rename from xmloff/inc/xmloff/EnumPropertyHdl.hxx rename to include/xmloff/EnumPropertyHdl.hxx diff --git a/xmloff/inc/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/GradientStyle.hxx rename to include/xmloff/GradientStyle.hxx diff --git a/xmloff/inc/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/HatchStyle.hxx rename to include/xmloff/HatchStyle.hxx diff --git a/xmloff/inc/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/ImageStyle.hxx rename to include/xmloff/ImageStyle.hxx diff --git a/xmloff/inc/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/MarkerStyle.hxx rename to include/xmloff/MarkerStyle.hxx diff --git a/xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx similarity index 100% rename from xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx rename to include/xmloff/NamedBoolPropertyHdl.hxx diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx similarity index 100% rename from xmloff/inc/xmloff/PageMasterStyleMap.hxx rename to include/xmloff/PageMasterStyleMap.hxx diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/ProgressBarHelper.hxx rename to include/xmloff/ProgressBarHelper.hxx diff --git a/xmloff/inc/xmloff/PropertySetInfoHash.hxx b/include/xmloff/PropertySetInfoHash.hxx similarity index 100% rename from xmloff/inc/xmloff/PropertySetInfoHash.hxx rename to include/xmloff/PropertySetInfoHash.hxx diff --git a/xmloff/inc/xmloff/PropertySetInfoKey.hxx b/include/xmloff/PropertySetInfoKey.hxx similarity index 100% rename from xmloff/inc/xmloff/PropertySetInfoKey.hxx rename to include/xmloff/PropertySetInfoKey.hxx diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/SchXMLExportHelper.hxx rename to include/xmloff/SchXMLExportHelper.hxx diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/SchXMLImportHelper.hxx rename to include/xmloff/SchXMLImportHelper.hxx diff --git a/xmloff/inc/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/SchXMLSeriesHelper.hxx rename to include/xmloff/SchXMLSeriesHelper.hxx diff --git a/xmloff/inc/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/SettingsExportHelper.hxx rename to include/xmloff/SettingsExportHelper.hxx diff --git a/xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx similarity index 100% rename from xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx rename to include/xmloff/SinglePropertySetInfoCache.hxx diff --git a/xmloff/inc/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx similarity index 100% rename from xmloff/inc/xmloff/WordWrapPropertyHdl.hxx rename to include/xmloff/WordWrapPropertyHdl.hxx diff --git a/xmloff/inc/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLBase64ImportContext.hxx rename to include/xmloff/XMLBase64ImportContext.hxx diff --git a/xmloff/inc/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLCharContext.hxx rename to include/xmloff/XMLCharContext.hxx diff --git a/xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx rename to include/xmloff/XMLConstantsPropertyHandler.hxx diff --git a/xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx rename to include/xmloff/XMLEmbeddedObjectExportFilter.hxx diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLEventExport.hxx rename to include/xmloff/XMLEventExport.hxx diff --git a/xmloff/inc/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLEventsImportContext.hxx rename to include/xmloff/XMLEventsImportContext.hxx diff --git a/xmloff/inc/xmloff/XMLFilterServiceNames.h b/include/xmloff/XMLFilterServiceNames.h similarity index 100% rename from xmloff/inc/xmloff/XMLFilterServiceNames.h rename to include/xmloff/XMLFilterServiceNames.h diff --git a/xmloff/inc/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLFontAutoStylePool.hxx rename to include/xmloff/XMLFontAutoStylePool.hxx diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLFontStylesContext.hxx rename to include/xmloff/XMLFontStylesContext.hxx diff --git a/xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx rename to include/xmloff/XMLGraphicsDefaultStyle.hxx diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLPageExport.hxx rename to include/xmloff/XMLPageExport.hxx diff --git a/xmloff/inc/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLSettingsExportContext.hxx rename to include/xmloff/XMLSettingsExportContext.hxx diff --git a/xmloff/inc/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLShapeStyleContext.hxx rename to include/xmloff/XMLShapeStyleContext.hxx diff --git a/xmloff/inc/xmloff/XMLStringVector.hxx b/include/xmloff/XMLStringVector.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLStringVector.hxx rename to include/xmloff/XMLStringVector.hxx diff --git a/xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx rename to include/xmloff/XMLTextListAutoStylePool.hxx diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextMasterPageContext.hxx rename to include/xmloff/XMLTextMasterPageContext.hxx diff --git a/xmloff/inc/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextMasterPageExport.hxx rename to include/xmloff/XMLTextMasterPageExport.hxx diff --git a/xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx rename to include/xmloff/XMLTextMasterStylesContext.hxx diff --git a/xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx rename to include/xmloff/XMLTextShapeImportHelper.hxx diff --git a/xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx rename to include/xmloff/XMLTextShapeStyleContext.hxx diff --git a/xmloff/inc/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx similarity index 100% rename from xmloff/inc/xmloff/XMLTextTableContext.hxx rename to include/xmloff/XMLTextTableContext.hxx diff --git a/xmloff/inc/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx similarity index 100% rename from xmloff/inc/xmloff/animationexport.hxx rename to include/xmloff/animationexport.hxx diff --git a/xmloff/inc/xmloff/animexp.hxx b/include/xmloff/animexp.hxx similarity index 100% rename from xmloff/inc/xmloff/animexp.hxx rename to include/xmloff/animexp.hxx diff --git a/xmloff/inc/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx similarity index 100% rename from xmloff/inc/xmloff/attrlist.hxx rename to include/xmloff/attrlist.hxx diff --git a/xmloff/inc/xmloff/contextid.hxx b/include/xmloff/contextid.hxx similarity index 100% rename from xmloff/inc/xmloff/contextid.hxx rename to include/xmloff/contextid.hxx diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx similarity index 100% rename from xmloff/inc/xmloff/controlpropertyhdl.hxx rename to include/xmloff/controlpropertyhdl.hxx diff --git a/xmloff/inc/xmloff/dllapi.h b/include/xmloff/dllapi.h similarity index 100% rename from xmloff/inc/xmloff/dllapi.h rename to include/xmloff/dllapi.h diff --git a/xmloff/inc/xmloff/families.hxx b/include/xmloff/families.hxx similarity index 100% rename from xmloff/inc/xmloff/families.hxx rename to include/xmloff/families.hxx diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx similarity index 100% rename from xmloff/inc/xmloff/formlayerexport.hxx rename to include/xmloff/formlayerexport.hxx diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx similarity index 100% rename from xmloff/inc/xmloff/formlayerimport.hxx rename to include/xmloff/formlayerimport.hxx diff --git a/xmloff/inc/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx similarity index 100% rename from xmloff/inc/xmloff/i18nmap.hxx rename to include/xmloff/i18nmap.hxx diff --git a/xmloff/inc/xmloff/maptype.hxx b/include/xmloff/maptype.hxx similarity index 100% rename from xmloff/inc/xmloff/maptype.hxx rename to include/xmloff/maptype.hxx diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx similarity index 100% rename from xmloff/inc/xmloff/nmspmap.hxx rename to include/xmloff/nmspmap.hxx diff --git a/xmloff/inc/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx similarity index 100% rename from xmloff/inc/xmloff/numehelp.hxx rename to include/xmloff/numehelp.hxx diff --git a/xmloff/inc/xmloff/odffields.hxx b/include/xmloff/odffields.hxx similarity index 100% rename from xmloff/inc/xmloff/odffields.hxx rename to include/xmloff/odffields.hxx diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx similarity index 100% rename from xmloff/inc/xmloff/prhdlfac.hxx rename to include/xmloff/prhdlfac.hxx diff --git a/xmloff/inc/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx similarity index 100% rename from xmloff/inc/xmloff/prstylei.hxx rename to include/xmloff/prstylei.hxx diff --git a/xmloff/inc/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx similarity index 100% rename from xmloff/inc/xmloff/settingsstore.hxx rename to include/xmloff/settingsstore.hxx diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx similarity index 100% rename from xmloff/inc/xmloff/shapeexport.hxx rename to include/xmloff/shapeexport.hxx diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx similarity index 100% rename from xmloff/inc/xmloff/shapeimport.hxx rename to include/xmloff/shapeimport.hxx diff --git a/xmloff/inc/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx similarity index 100% rename from xmloff/inc/xmloff/styleexp.hxx rename to include/xmloff/styleexp.hxx diff --git a/xmloff/inc/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx similarity index 100% rename from xmloff/inc/xmloff/table/XMLTableExport.hxx rename to include/xmloff/table/XMLTableExport.hxx diff --git a/xmloff/inc/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx similarity index 100% rename from xmloff/inc/xmloff/table/XMLTableImport.hxx rename to include/xmloff/table/XMLTableImport.hxx diff --git a/xmloff/inc/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx similarity index 100% rename from xmloff/inc/xmloff/txtimp.hxx rename to include/xmloff/txtimp.hxx diff --git a/xmloff/inc/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx similarity index 100% rename from xmloff/inc/xmloff/txtimppr.hxx rename to include/xmloff/txtimppr.hxx diff --git a/xmloff/inc/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx similarity index 100% rename from xmloff/inc/xmloff/txtparae.hxx rename to include/xmloff/txtparae.hxx diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx similarity index 100% rename from xmloff/inc/xmloff/txtprmap.hxx rename to include/xmloff/txtprmap.hxx diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx similarity index 100% rename from xmloff/inc/xmloff/txtstyli.hxx rename to include/xmloff/txtstyli.hxx diff --git a/xmloff/inc/xmloff/uniref.hxx b/include/xmloff/uniref.hxx similarity index 100% rename from xmloff/inc/xmloff/uniref.hxx rename to include/xmloff/uniref.hxx diff --git a/xmloff/inc/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx similarity index 100% rename from xmloff/inc/xmloff/unoatrcn.hxx rename to include/xmloff/unoatrcn.hxx diff --git a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx similarity index 100% rename from xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx rename to include/xmloff/unointerfacetouniqueidentifiermapper.hxx diff --git a/xmloff/inc/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx similarity index 100% rename from xmloff/inc/xmloff/xformsexport.hxx rename to include/xmloff/xformsexport.hxx diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx similarity index 100% rename from xmloff/inc/xmloff/xformsimport.hxx rename to include/xmloff/xformsimport.hxx diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlaustp.hxx rename to include/xmloff/xmlaustp.hxx diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlcnimp.hxx rename to include/xmloff/xmlcnimp.hxx diff --git a/xmloff/inc/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlement.hxx rename to include/xmloff/xmlement.hxx diff --git a/xmloff/inc/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlerror.hxx rename to include/xmloff/xmlerror.hxx diff --git a/xmloff/inc/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlevent.hxx rename to include/xmloff/xmlevent.hxx diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlexp.hxx rename to include/xmloff/xmlexp.hxx diff --git a/xmloff/inc/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlexppr.hxx rename to include/xmloff/xmlexppr.hxx diff --git a/xmloff/inc/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlictxt.hxx rename to include/xmloff/xmlictxt.hxx diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlimp.hxx rename to include/xmloff/xmlimp.hxx diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlimppr.hxx rename to include/xmloff/xmlimppr.hxx diff --git a/xmloff/inc/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlmetae.hxx rename to include/xmloff/xmlmetae.hxx diff --git a/xmloff/inc/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlmetai.hxx rename to include/xmloff/xmlmetai.hxx diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlmultiimagehelper.hxx rename to include/xmloff/xmlmultiimagehelper.hxx diff --git a/xmloff/inc/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlnmspe.hxx rename to include/xmloff/xmlnmspe.hxx diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlnume.hxx rename to include/xmloff/xmlnume.hxx diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlnumfe.hxx rename to include/xmloff/xmlnumfe.hxx diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlnumfi.hxx rename to include/xmloff/xmlnumfi.hxx diff --git a/xmloff/inc/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlnumi.hxx rename to include/xmloff/xmlnumi.hxx diff --git a/xmloff/inc/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlprcon.hxx rename to include/xmloff/xmlprcon.hxx diff --git a/xmloff/inc/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlprhdl.hxx rename to include/xmloff/xmlprhdl.hxx diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlprmap.hxx rename to include/xmloff/xmlprmap.hxx diff --git a/xmloff/inc/xmloff/xmlreg.hxx b/include/xmloff/xmlreg.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlreg.hxx rename to include/xmloff/xmlreg.hxx diff --git a/xmloff/inc/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlscripti.hxx rename to include/xmloff/xmlscripti.hxx diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx similarity index 100% rename from xmloff/inc/xmloff/xmlstyle.hxx rename to include/xmloff/xmlstyle.hxx diff --git a/xmloff/inc/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx similarity index 100% rename from xmloff/inc/xmloff/xmltabe.hxx rename to include/xmloff/xmltabe.hxx diff --git a/xmloff/inc/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx similarity index 100% rename from xmloff/inc/xmloff/xmltkmap.hxx rename to include/xmloff/xmltkmap.hxx diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx similarity index 100% rename from xmloff/inc/xmloff/xmltoken.hxx rename to include/xmloff/xmltoken.hxx diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx similarity index 100% rename from xmloff/inc/xmloff/xmltypes.hxx rename to include/xmloff/xmltypes.hxx diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx similarity index 100% rename from xmloff/inc/xmloff/xmluconv.hxx rename to include/xmloff/xmluconv.hxx diff --git a/xmlreader/inc/xmlreader/README b/include/xmlreader/README similarity index 100% rename from xmlreader/inc/xmlreader/README rename to include/xmlreader/README diff --git a/xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx b/include/xmlreader/detail/xmlreaderdllapi.hxx similarity index 100% rename from xmlreader/inc/xmlreader/detail/xmlreaderdllapi.hxx rename to include/xmlreader/detail/xmlreaderdllapi.hxx diff --git a/xmlreader/inc/xmlreader/pad.hxx b/include/xmlreader/pad.hxx similarity index 100% rename from xmlreader/inc/xmlreader/pad.hxx rename to include/xmlreader/pad.hxx diff --git a/xmlreader/inc/xmlreader/span.hxx b/include/xmlreader/span.hxx similarity index 100% rename from xmlreader/inc/xmlreader/span.hxx rename to include/xmlreader/span.hxx diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx similarity index 100% rename from xmlreader/inc/xmlreader/xmlreader.hxx rename to include/xmlreader/xmlreader.hxx diff --git a/xmlscript/inc/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx similarity index 100% rename from xmlscript/inc/xmlscript/xml_helper.hxx rename to include/xmlscript/xml_helper.hxx diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx similarity index 100% rename from xmlscript/inc/xmlscript/xmldlg_imexp.hxx rename to include/xmlscript/xmldlg_imexp.hxx diff --git a/xmlscript/inc/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx similarity index 100% rename from xmlscript/inc/xmlscript/xmllib_imexp.hxx rename to include/xmlscript/xmllib_imexp.hxx diff --git a/xmlscript/inc/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx similarity index 100% rename from xmlscript/inc/xmlscript/xmlmod_imexp.hxx rename to include/xmlscript/xmlmod_imexp.hxx diff --git a/xmlscript/inc/xmlscript/xmlns.h b/include/xmlscript/xmlns.h similarity index 100% rename from xmlscript/inc/xmlscript/xmlns.h rename to include/xmlscript/xmlns.h diff --git a/xmlscript/inc/xmlscript/xmlscriptdllapi.h b/include/xmlscript/xmlscriptdllapi.h similarity index 100% rename from xmlscript/inc/xmlscript/xmlscriptdllapi.h rename to 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 -# -# 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 -# -# 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 -# 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 (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 -# 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 (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 #include #include -#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 #include #include 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 (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 -# -# 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: