18 files changed, 388 insertions, 360 deletions
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 1b691830f0b1..2db5c338fea7 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -17,26 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
-#include <tools/shl.hxx>
-#include "svx/ofaitem.hxx"
 #include <sfx2/request.hxx>
-#include <svx/dialogs.hrc>
+#include <tools/shl.hxx>
 
-#include <svx/svdoedge.hxx>
+#include <svx/connctrl.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dlgutil.hxx>
+#include <svx/ofaitem.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
+#include <svx/svdoedge.hxx>
 #include <svx/svdview.hxx>
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
 
-#include "svx/connctrl.hxx"
-#include "connect.hxx"
 #include "connect.hrc"
-#include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-
+#include "connect.hxx"
 #include "paragrph.hrc"
-#include <cuires.hrc>
 
 static sal_uInt16 pRanges[] =
 {
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 819dd2a2d1e8..0f3720a3c455 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -18,20 +18,25 @@
  */
 
 #include <comphelper/string.hxx>
-#include <tools/shl.hxx>
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <swpossizetabpage.hxx>
+#include <tools/shl.hxx>
+
 #include <svx/dialogs.hrc>
+#include <svx/svddef.hxx>
+#include <svx/sxcaitm.hxx>
+#include <svx/sxcecitm.hxx>
+#include <svx/sxcgitm.hxx>
+#include <svx/sxcllitm.hxx>
+#include <svx/sxctitm.hxx>
 
-#include <svx/svdattrx.hxx>
-#include <cuires.hrc>
-#include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
-#include "transfrm.hxx"
-
 #include "labdlg.hrc"
 #include "labdlg.hxx"
+#include "transfrm.hxx"
 
 // define ----------------------------------------------------------------
 
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9575041e4d15..96d05dbe27ef 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -17,26 +17,36 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <cuires.hrc>
+#include <dialmgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
+#include <sfx2/request.hxx>
 #include <tools/shl.hxx>
 
-#include <cuires.hrc>
-
-#include <svx/svdomeas.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/dlgutil.hxx>
+#include <svx/measctrl.hxx>
+#include <svx/ofaitem.hxx>
+#include <svx/strarray.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
+#include <svx/svdomeas.hxx>
 #include <svx/svdview.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/dialmgr.hxx>
-#include "svx/measctrl.hxx"
-#include "measure.hxx"
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
+#include <svx/sxmbritm.hxx>
+#include <svx/sxmfsitm.hxx>
+#include <svx/sxmlhitm.hxx>
+#include <svx/sxmsuitm.hxx>
+#include <svx/sxmtfitm.hxx>
+#include <svx/sxmtpitm.hxx>
+#include <svx/sxmtritm.hxx>
+#include <svx/sxmuitm.hxx>
+
 #include "measure.hrc"
-#include <dialmgr.hxx>
-#include "svx/dlgutil.hxx"
-#include <svx/strarray.hxx>
-#include <sfx2/request.hxx>
-#include "svx/ofaitem.hxx"
+#include "measure.hxx"
 
 static sal_uInt16 pRanges[] =
 {
diff --git a/include/svx/svdattrx.hxx b/include/svx/svdattrx.hxx
deleted file mode 100644
index ca1aa00c4292..000000000000
--- a/include/svx/svdattrx.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#ifndef _SVDATTRX_HXX
-#define _SVDATTRX_HXX
-
-#include <svx/sxmlhitm.hxx>
-#include <svx/sxallitm.hxx>
-#include <svx/sxcaitm.hxx>
-#include <svx/sxcecitm.hxx>
-
-#include <svx/sxcgitm.hxx>
-#include <svx/sxciaitm.hxx>
-#include <svx/sxcikitm.hxx>
-#include <svx/sxcllitm.hxx>
-#include <svx/sxctitm.hxx>
-#include <svx/sxekitm.hxx>
-#include <svx/sxelditm.hxx>
-#include <svx/sxenditm.hxx>
-
-#include <svx/sxfiitm.hxx>
-
-#include <svx/sxlayitm.hxx>
-#include <svx/sxlogitm.hxx>
-#include <svx/sxmbritm.hxx>
-#include <svx/sxmfsitm.hxx>
-#include <svx/sxmkitm.hxx>
-#include <svx/sxmoitm.hxx>
-#include <svx/sxmovitm.hxx>
-
-#include <svx/sxmsitm.hxx>
-#include <svx/sxmspitm.hxx>
-#include <svx/sxmsuitm.hxx>
-#include <svx/sxmtaitm.hxx>
-#include <svx/sxmtfitm.hxx>
-#include <svx/sxmtpitm.hxx>
-#include <svx/sxmtritm.hxx>
-#include <svx/sxmuitm.hxx>
-#include <svx/sxoneitm.hxx>
-#include <svx/sxonitm.hxx>
-#include <svx/sxopitm.hxx>
-#include <svx/sxraitm.hxx>
-#include <svx/sxreaitm.hxx>
-#include <svx/sxreoitm.hxx>
-#include <svx/sxroaitm.hxx>
-#include <svx/sxrooitm.hxx>
-#include <svx/sxsaitm.hxx>
-#include <svx/sxsalitm.hxx>
-#include <svx/sxsiitm.hxx>
-#include <svx/sxsoitm.hxx>
-#include <svx/sxtraitm.hxx>
-
-#endif  //_SVDATTRX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 59b149ca257b..65c386cb680b 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -17,21 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svdoedge.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdmark.hxx>
-#include <svx/svdview.hxx>
-
-#include <svx/svdpage.hxx> // SdrObjList
+#include <vcl/svapp.hxx>
 
 #include "svx/connctrl.hxx"
-#include <svx/dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 
-#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
-
+#include <svx/dialmgr.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
-#include <vcl/svapp.hxx>
+#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
+#include <svx/svdmark.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdpage.hxx> // SdrObjList
+#include <svx/svdview.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxmkitm.hxx>
 
 SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, const ResId& rResId,
                             const SfxItemSet& rInAttrs ) :
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index bdc821d1cdff..5d50104572ac 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -30,38 +30,76 @@
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <unotools/intlwrapper.hxx>
-#include <comphelper/processfactory.hxx>
-#include <vcl/svapp.hxx>
-#include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdpool.hxx>
-
-#include <svl/solar.hrc>
+#include "editeng/boxitem.hxx"
+#include "editeng/lineitem.hxx"
+#include "editeng/shaditem.hxx"
 #include "editeng/xmlcnitm.hxx"
+#include <comphelper/processfactory.hxx>
+#include <editeng/adjustitem.hxx>
 #include <editeng/editdata.hxx>
+#include <editeng/writingmodeitem.hxx>
+#include <svl/solar.hrc>
+#include <tools/bigint.hxx>
+#include <tools/stream.hxx>
+#include <unotools/intlwrapper.hxx>
+#include <vcl/svapp.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/xtable.hxx>    // for RGB_Color()
-#include <svx/svdmodel.hxx>  // for DEGREE_CHAR
-#include <svx/svdtrans.hxx>
 #include "svx/svdglob.hxx"  // string cache
 #include "svx/svdstr.hrc"
+
 #include <svx/sdgcpitm.hxx>
-#include <editeng/adjustitem.hxx>
 #include <svx/sdtfchim.hxx>
-#include <editeng/writingmodeitem.hxx>
-#include <tools/bigint.hxx>
-#include <tools/stream.hxx>
-
+#include <svx/svdattr.hxx>
+#include <svx/svdmodel.hxx>  // for DEGREE_CHAR
+#include <svx/svdpool.hxx>
+#include <svx/svdtrans.hxx>
+#include <svx/svx3ditems.hxx>
+#include <svx/svxids.hrc>
+#include <svx/sxallitm.hxx>
+#include <svx/sxcaitm.hxx>
+#include <svx/sxcecitm.hxx>
+#include <svx/sxcgitm.hxx>
+#include <svx/sxciaitm.hxx>
+#include <svx/sxcikitm.hxx>
+#include <svx/sxcllitm.hxx>
+#include <svx/sxctitm.hxx>
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
+#include <svx/sxfiitm.hxx>
+#include <svx/sxlayitm.hxx>
+#include <svx/sxlogitm.hxx>
+#include <svx/sxmbritm.hxx>
+#include <svx/sxmfsitm.hxx>
+#include <svx/sxmkitm.hxx>
+#include <svx/sxmlhitm.hxx>
+#include <svx/sxmoitm.hxx>
+#include <svx/sxmovitm.hxx>
+#include <svx/sxmsitm.hxx>
+#include <svx/sxmspitm.hxx>
+#include <svx/sxmsuitm.hxx>
+#include <svx/sxmtaitm.hxx>
+#include <svx/sxmtfitm.hxx>
+#include <svx/sxmtpitm.hxx>
+#include <svx/sxmtritm.hxx>
+#include <svx/sxmuitm.hxx>
+#include <svx/sxoneitm.hxx>
+#include <svx/sxonitm.hxx>
+#include <svx/sxopitm.hxx>
+#include <svx/sxraitm.hxx>
+#include <svx/sxreaitm.hxx>
+#include <svx/sxreoitm.hxx>
+#include <svx/sxroaitm.hxx>
+#include <svx/sxrooitm.hxx>
+#include <svx/sxsaitm.hxx>
+#include <svx/sxsalitm.hxx>
+#include <svx/sxsiitm.hxx>
+#include <svx/sxsoitm.hxx>
+#include <svx/sxtraitm.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xlineit0.hxx>
-#include <svx/svx3ditems.hxx>
-
-#include "editeng/boxitem.hxx"
-#include "editeng/shaditem.hxx"
-#include "editeng/lineitem.hxx"
+#include <svx/xtable.hxx>    // for RGB_Color()
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/svdraw/svdconv.hxx b/svx/source/svdraw/svdconv.hxx
index fb7020a96443..9b271d4f523e 100644
--- a/svx/source/svdraw/svdconv.hxx
+++ b/svx/source/svdraw/svdconv.hxx
@@ -10,6 +10,8 @@
 #ifndef _SVDCONV_HXX
 #define _SVDCONV_HXX
 
+#include <sal/types.h>
+
 template<typename T> inline T ImplMMToTwips(T val);
 template<>
 inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index e1593e8704fa..6468c9121133 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -17,41 +17,49 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <svx/svdedtv.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eeitem.hxx>
 #include <math.h>
-
-#include <tools/bigint.hxx>
+#include <svl/aeitem.hxx>
 #include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <tools/bigint.hxx>
 #include <vcl/msgbox.hxx>
-#include <svx/rectenum.hxx>
-#include <svx/svxids.hrc>   // for SID_ATTR_TRANSFORM_...
-#include <svx/svdattr.hxx>  // for Get/SetGeoAttr
+
+#include "svx/svdglob.hxx"  // StringCache
 #include "svx/svditer.hxx"
-#include <svx/svdtrans.hxx>
-#include <svx/svdundo.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdlayer.hxx> // for MergeNotPersistAttr
-#include <svx/svdattrx.hxx> // for MergeNotPersistAttr
-#include <svx/svdetc.hxx>   // for SearchOutlinerItems
-#include <svx/svdopath.hxx>  // for Crook
 #include "svx/svdstr.hrc"   // names taken from the resource
-#include "svx/svdglob.hxx"  // StringCache
-#include <editeng/editdata.hxx>
-#include <editeng/eeitem.hxx>
-#include <svl/aeitem.hxx>
-#include <svl/whiter.hxx>
-#include <svx/sdr/contact/objectcontact.hxx>
-#include <svx/sdr/contact/viewcontact.hxx>
+
+#include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <svx/obj3d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/AffineMatrixItem.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svx/xlnwtit.hxx>
-#include <svx/xlnstwit.hxx>
+#include <svx/rectenum.hxx>
+#include <svx/sdr/contact/objectcontact.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
+#include <svx/svdattr.hxx>  // for Get/SetGeoAttr
+#include <svx/svdedtv.hxx>
+#include <svx/svdetc.hxx>   // for SearchOutlinerItems
+#include <svx/svdlayer.hxx> // for MergeNotPersistAttr
+#include <svx/svdopath.hxx>  // for Crook
+#include <svx/svdpage.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdtrans.hxx>
+#include <svx/svdundo.hxx>
+#include <svx/svxids.hrc>   // for SID_ATTR_TRANSFORM_...
+#include <svx/sxallitm.hxx>
+#include <svx/sxmovitm.hxx>
+#include <svx/sxreaitm.hxx>
+#include <svx/sxreoitm.hxx>
+#include <svx/sxroaitm.hxx>
+#include <svx/sxrooitm.hxx>
+#include <svx/sxsalitm.hxx>
+#include <svx/sxsoitm.hxx>
+#include <svx/sxtraitm.hxx>
 #include <svx/xlnedwit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xlnwtit.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index bd465e57d635..a915915c9157 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -17,42 +17,43 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/eeitem.hxx>
-
-#include "svdibrow.hxx"
-
 #include <stdlib.h>
 
-#include <editeng/flditem.hxx>
+#include "editeng/fontitem.hxx"
+#include "svdibrow.hxx"
+#include <editeng/charscaleitem.hxx>
+#include <editeng/colritem.hxx>
 #include <editeng/editdata.hxx>
-#include <svx/svdpool.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/flditem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/ptitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/rngitem.hxx>
+#include <svl/whiter.hxx>
+
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
+#include <svx/svdpool.hxx>
 #include <svx/svdview.hxx>
+#include <svx/sxcaitm.hxx>
+#include <svx/sxcecitm.hxx>
+#include <svx/sxcikitm.hxx>
+#include <svx/sxcllitm.hxx>
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxfiitm.hxx>
 #include <svx/xenum.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnedwit.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xflbmtit.hxx>
-#include <svx/xtextit0.hxx>
 #include <svx/xflbstit.hxx>
 #include <svx/xflbtoxy.hxx>
 #include <svx/xftshit.hxx>
-#include <editeng/colritem.hxx>
-
-
-#include "editeng/fontitem.hxx"
-#include <editeng/fhgtitem.hxx>
-
-#include <editeng/charscaleitem.hxx>
-#include <svl/whiter.hxx>
-#include <svl/flagitem.hxx>
-#include <svl/ptitem.hxx>
-#include <svl/rectitem.hxx>
-
-#include <svl/rngitem.hxx>
-#include <svx/sdrpaintwindow.hxx>
+#include <svx/xlineit0.hxx>
+#include <svx/xlnedwit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xtextit0.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a0c09cb4dc29..b6bfd6c68df8 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -43,7 +43,6 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // for broadcasting connectors to Move
 #include "svx/svdglob.hxx"   // StringCache
 #include "svx/svdstr.hrc"    // the object's name
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 6806c6d32efd..535f15d87768 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -23,7 +23,6 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdattrx.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdocapt.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6930128ad850..571b7296bb4a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -21,95 +21,109 @@
 
 #include <com/sun/star/lang/XComponent.hpp>
 
+#include "svdconv.hxx"
+
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <drawinglayer/processor2d/contourextractor2d.hxx>
+#include <drawinglayer/processor2d/linegeometryextractor2d.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
 #include <math.h>
-#include <vcl/metaact.hxx>   // for TakeContour
-#include <vcl/cvtsvm.hxx>
-#include <tools/line.hxx>
+#include <sfx2/objface.hxx>
+#include <sfx2/objsh.hxx>
+#include <svl/whiter.hxx>
+#include <svtools/colorcfg.hxx>
 #include <tools/bigint.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/helpers.hxx>
+#include <tools/line.hxx>
+#include <vcl/cvtsvm.hxx>
+#include <vcl/graphictools.hxx>
+#include <vcl/metaact.hxx>   // for TakeContour
+#include <vcl/virdev.hxx>
 #include <vector>
-#include <svx/svdobj.hxx>
-#include <svx/xpoly.hxx>
+
+#include "svx/shapepropertynotifier.hxx"
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdotable.hxx"
+#include "svx/xlinjoit.hxx"
+
+#include <svx/fmmodel.hxx>
+#include <svx/polysc3d.hxx>
+#include <svx/sdr/contact/displayinfo.hxx>
+#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
+#include <svx/sdr/contact/viewcontactofgraphic.hxx>
+#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
+#include <svx/sdr/properties/emptyproperties.hxx>
+#include <svx/sdrhittesthelper.hxx>
+#include <svx/sdrobjectfilter.hxx>
+#include <svx/svddrag.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdtrans.hxx>
 #include <svx/svdhdl.hxx>
-#include <svx/svddrag.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdovirt.hxx>  // for Add/Del Ref
-#include <svx/svdview.hxx>   // for Dragging (check Ortho)
-#include "svx/svdglob.hxx"   // StringCache
-#include <svx/svdstr.hrc>    // the object's name
-#include <svx/svdogrp.hxx>   // Factory
-#include <svx/svdopath.hxx>  // Factory
-#include <svx/svdoedge.hxx>  // Factory
-#include <svx/svdorect.hxx>  // Factory
+#include <svx/svdoashp.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdocapt.hxx>  // Factory
 #include <svx/svdocirc.hxx>  // Factory
-#include <svx/svdotext.hxx>  // Factory
-#include <svx/svdomeas.hxx>  // Factory
+#include <svx/svdoedge.hxx>  // Factory
 #include <svx/svdograf.hxx>  // Factory
+#include <svx/svdogrp.hxx>   // Factory
+#include <svx/svdomeas.hxx>  // Factory
+#include <svx/svdomedia.hxx>
 #include <svx/svdoole2.hxx>  // Factory
-#include <svx/svdocapt.hxx>  // Factory
 #include <svx/svdopage.hxx>  // Factory
+#include <svx/svdopath.hxx>  // Factory
+#include <svx/svdorect.hxx>  // Factory
+#include <svx/svdotext.hxx>  // Factory
 #include <svx/svdouno.hxx>   // Factory
-#include <svx/svdattrx.hxx> // NotPersistItems
-#include <svx/svdoashp.hxx>
-#include <svx/svdomedia.hxx>
-#include <svx/xlnwtit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnedwit.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnedit.hxx>
-#include <svx/xlnstcit.hxx>
-#include <svx/xlnedcit.hxx>
-#include <svx/xlndsit.hxx>
-#include <svx/xlnclit.hxx>
-#include <svx/xflclit.hxx>
-#include <svx/svditer.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/xflftrit.hxx>
-#include "svx/xlinjoit.hxx"
+#include <svx/svdovirt.hxx>  // for Add/Del Ref
+#include <svx/svdpage.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdstr.hrc>    // the object's name
+#include <svx/svdtrans.hxx>
+#include <svx/svdundo.hxx>
+#include <svx/svdview.hxx>   // for Dragging (check Ortho)
+#include <svx/sxlayitm.hxx>
+#include <svx/sxlogitm.hxx>
+#include <svx/sxmovitm.hxx>
+#include <svx/sxmspitm.hxx>
+#include <svx/sxoneitm.hxx>
+#include <svx/sxonitm.hxx>
+#include <svx/sxopitm.hxx>
+#include <svx/sxraitm.hxx>
+#include <svx/sxreoitm.hxx>
+#include <svx/sxrooitm.hxx>
+#include <svx/sxsaitm.hxx>
+#include <svx/sxsoitm.hxx>
+#include <svx/sxtraitm.hxx>
 #include <svx/unopage.hxx>
-#include <editeng/eeitem.hxx>
+#include <svx/unoshape.hxx>
+#include <svx/xbtmpit.hxx>
 #include <svx/xenum.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xfltrit.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xhatch.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/svdpool.hxx>
-#include <editeng/editeng.hxx>
-#include <svl/whiter.hxx>
-
-#include <svx/fmmodel.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/objface.hxx>
-#include <vcl/graphictools.hxx>
-#include <svtools/colorcfg.hxx>
-#include <svx/sdr/properties/emptyproperties.hxx>
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-#include <svx/sdr/contact/viewcontactofgraphic.hxx>
-#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
-#include <svx/sdr/contact/displayinfo.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <svx/unoshape.hxx>
-#include <vcl/virdev.hxx>
-#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-#include <drawinglayer/processor2d/contourextractor2d.hxx>
-#include <drawinglayer/processor2d/linegeometryextractor2d.hxx>
-#include <svx/polysc3d.hxx>
-#include "svx/svdotable.hxx"
-#include "svx/shapepropertynotifier.hxx"
-#include <svx/sdrhittesthelper.hxx>
-#include <svx/svdundo.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svx/sdrobjectfilter.hxx>
-#include "svdconv.hxx"
+#include <svx/xlnclit.hxx>
+#include <svx/xlndsit.hxx>
+#include <svx/xlnedcit.hxx>
+#include <svx/xlnedit.hxx>
+#include <svx/xlnedwit.hxx>
+#include <svx/xlnstcit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xlntrit.hxx>
+#include <svx/xlnwtit.hxx>
+#include <svx/xpoly.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index de6779e1c78c..29115e8c9caf 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -17,38 +17,44 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
+#include <editeng/eeitem.hxx>
+#include <svl/style.hxx>
 #include <tools/bigint.hxx>
 #include <tools/helpers.hxx>
-#include <svx/xlnwtit.hxx>
-#include <svl/style.hxx>
-#include <svx/svdocapt.hxx>
-#include <svx/xpool.hxx>
-#include <svx/xpoly.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdpool.hxx>
+
+#include "svdconv.hxx"
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // the object's name
+
+#include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx>
+#include <svx/sdr/properties/captionproperties.hxx>
+#include <svx/sdrhittesthelper.hxx>
+#include <svx/svddrag.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdtrans.hxx>
 #include <svx/svdhdl.hxx>
-#include <svx/svddrag.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdview.hxx>   // for RectSnap
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
+#include <svx/svdocapt.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/xflhtit.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdtrans.hxx>
+#include <svx/svdview.hxx>   // for RectSnap
+#include <svx/sxcaitm.hxx>
+#include <svx/sxcecitm.hxx>
+#include <svx/sxcgitm.hxx>
+#include <svx/sxcllitm.hxx>
+#include <svx/sxctitm.hxx>
 #include <svx/xflclit.hxx>
+#include <svx/xflhtit.hxx>
 #include <svx/xfltrit.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/sdr/properties/captionproperties.hxx>
-#include <svx/sdr/contact/viewcontactofsdrcaptionobj.hxx>
-#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <svx/sdrhittesthelper.hxx>
-#include "svdconv.hxx"
+#include <svx/xlnwtit.hxx>
+#include <svx/xpoly.hxx>
+#include <svx/xpool.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 9390388327b8..5edc746d7bdd 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -17,35 +17,38 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/style.hxx>
-#include <svx/xlnwtit.hxx>
-#include <svx/xlnedwit.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnedit.hxx>
-#include <svx/svdocirc.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <editeng/eeitem.hxx>
 #include <math.h>
-#include <svx/xpool.hxx>
+#include <svl/style.hxx>
+
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // the object's name
+
+#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
+#include <svx/sdr/properties/circleproperties.hxx>
 #include <svx/svdattr.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdtrans.hxx>
-#include <svx/svdetc.hxx>
 #include <svx/svddrag.hxx>
+#include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
+#include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx> // for the object conversion
+#include <svx/svdpage.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdtrans.hxx>
 #include <svx/svdview.hxx>  // for dragging (Ortho)
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
-#include <editeng/eeitem.hxx>
-#include <svx/sdr/properties/circleproperties.hxx>
-#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <svx/sxciaitm.hxx>
+#include <svx/sxcikitm.hxx>
+#include <svx/xlnedit.hxx>
+#include <svx/xlnedwit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xlnwtit.hxx>
+#include <svx/xpool.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index d30350b89bdc..6c3eaa1983cb 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -17,33 +17,36 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#include <svx/svdoedge.hxx>
-#include <svx/xpool.hxx>
-#include <svx/xpoly.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdview.hxx>
-#include <svx/svddrag.hxx>
-#include <svx/svddrgv.hxx>
 #include "svddrgm1.hxx"
-#include <svx/svdhdl.hxx>
-#include <svx/svdtrans.hxx>
-#include <svx/svdetc.hxx>
 #include "svx/svdglob.hxx"   // StringCache
 #include "svx/svdstr.hrc"    // the object's name
-#include <svl/style.hxx>
-#include <svl/smplhint.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/sdr/properties/connectorproperties.hxx>
-#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
+
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <editeng/eeitem.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/style.hxx>
+
+#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
+#include <svx/sdr/properties/connectorproperties.hxx>
 #include <svx/sdrhittesthelper.hxx>
+#include <svx/svddrag.hxx>
+#include <svx/svddrgv.hxx>
+#include <svx/svdetc.hxx>
+#include <svx/svdhdl.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/svdoedge.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdtrans.hxx>
+#include <svx/svdview.hxx>
+#include <svx/sxekitm.hxx>
+#include <svx/sxelditm.hxx>
+#include <svx/sxenditm.hxx>
+#include <svx/xpoly.hxx>
+#include <svx/xpool.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index eeeba0a39e65..37cc3f9c24c3 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -36,7 +36,6 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
-#include <svx/svdattrx.hxx>  // NotPersistItems
 #include <svx/svdoedge.hxx>  // broadcast connectors to Move
 #include "svx/svdglob.hxx"   // StringCache
 #include "svx/svdstr.hrc"    // the object's name
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 02599bb73d41..7b3c34c17644 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -17,48 +17,61 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "svdconv.hxx"
+#include "svx/svdglob.hxx"   // StringCache
+#include "svx/svdstr.hrc"    // the object's name
 
-#include <svx/svdomeas.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/measfld.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <math.h>
-#include <svx/xpoly.hxx>
-#include <svx/svdtrans.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/style.hxx>
+
+#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
+#include <svx/sdr/properties/measureproperties.hxx>
+#include <svx/svddrag.hxx>
 #include <svx/svdhdl.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdomeas.hxx>
+#include <svx/svdopath.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svddrag.hxx>
+#include <svx/svdpage.hxx>
 #include <svx/svdpool.hxx>
-#include <svx/svdattrx.hxx>
-#include <svx/svdmodel.hxx>
+#include <svx/svdtrans.hxx>
 #include <svx/svdview.hxx>
-#include "svx/svdglob.hxx"   // StringCache
-#include "svx/svdstr.hrc"    // the object's name
-#include <svl/style.hxx>
-#include <svl/smplhint.hxx>
-#include <editeng/editdata.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnstwit.hxx>
+#include <svx/sxmbritm.hxx>
+#include <svx/sxmfsitm.hxx>
+#include <svx/sxmkitm.hxx>
+#include <svx/sxmlhitm.hxx>
+#include <svx/sxmoitm.hxx>
+#include <svx/sxmsitm.hxx>
+#include <svx/sxmsuitm.hxx>
+#include <svx/sxmtaitm.hxx>
+#include <svx/sxmtfitm.hxx>
+#include <svx/sxmtpitm.hxx>
+#include <svx/sxmtritm.hxx>
+#include <svx/sxmtritm.hxx>
+#include <svx/sxmuitm.hxx>
+#include <svx/xlnedcit.hxx>
 #include <svx/xlnedit.hxx>
-#include <svx/xlnwtit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstcit.hxx>
-#include <svx/xlnedcit.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/measfld.hxx>
-#include <editeng/flditem.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/svdpage.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnstwit.hxx>
+#include <svx/xlnwtit.hxx>
+#include <svx/xpoly.hxx>
 #include <unotools/syslocale.hxx>
-#include <svx/sdr/properties/measureproperties.hxx>
-#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include "svdconv.hxx"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index ff437df4b9ab..3b7aeb9f4c6e 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -38,7 +38,6 @@
 #include <svx/svdglue.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdattrx.hxx>
 #include "svdibrow.hxx"
 #include "svx/svditer.hxx"
 #include <svx/svdouno.hxx>