tdf#42949: clean up includes in include/filter with iwyu

Change-Id: Id08a999764bfeeff3bb3409b46f48b278009ccbe
Reviewed-on: https://gerrit.libreoffice.org/26238
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

34 files changed, 190 insertions, 117 deletions

diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx
index 68eb93f9596e..dae799b7de84 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -19,6 +19,8 @@
 
 #include <algorithm>
 #include <filter/msfilter/dffpropset.hxx>
+#include <filter/msfilter/dffrecordheader.hxx>
+#include <svx/msdffdef.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/stream.hxx>
 
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index e4d7c4b26c1c..d5e5cadb2448 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -83,6 +83,7 @@
 #include <com/sun/star/drawing/ColorMode.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/drawing/Direction3D.hpp>
+#include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index af001fb7f9fc..51ea8b573d29 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -9,8 +9,12 @@
 #include <filter/msfilter/mstoolbar.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <stdarg.h>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
+#include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index dc86a4e7c8dd..4690c6fd0657 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -25,6 +25,7 @@
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbmeth.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
@@ -34,7 +35,8 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
-#include<rtl/character.hxx>
+#include <rtl/character.hxx>
+#include <sfx2/objsh.hxx>
 
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <svtools/acceleratorexecute.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 830624498a89..e66f43f5bb3c 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -121,6 +121,7 @@
 #include <svtools/embedhlp.hxx>
 #include <o3tl/enumrange.hxx>
 #include <o3tl/make_unique.hxx>
+#include <boost/optional.hpp>
 
 #include <algorithm>
 #include <cassert>
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 3b85e1c27061..607791f96a1f 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -7,12 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <com/sun/star/awt/Size.hpp>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/salbtype.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <memory>
 #include <unordered_map>
diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx
index afb3ddbaa8cc..f3e47e8d6553 100644
--- a/include/filter/msfilter/countryid.hxx
+++ b/include/filter/msfilter/countryid.hxx
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX
 #define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX
 
-#include <sal/types.h>
-#include <i18nlangtag/lang.h>
 #include <filter/msfilter/msfilterdllapi.h>
+#include <i18nlangtag/lang.h>
+#include <sal/types.h>
 
 
 namespace msfilter {
diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx
index 57da2debe0b4..7a8ff2938cf7 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.hxx
@@ -19,10 +19,13 @@
 #ifndef INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX
 #define INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX
 
-#include <filter/msfilter/msfilterdllapi.h>
-#include <filter/msfilter/dffrecordheader.hxx>
 #include <vector>
 
+#include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <tools/solar.h>
+
 class SvStream;
 
 struct DffPropFlags
diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx
index e5c5121368f0..ade236c4ab8e 100644
--- a/include/filter/msfilter/dffrecordheader.hxx
+++ b/include/filter/msfilter/dffrecordheader.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX
 #define INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX
 
-#include <tools/solar.h>
-#include <tools/stream.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
 #include <svx/msdffdef.hxx>
+#include <sal/types.h>
+#include <tools/solar.h>
+#include <tools/stream.hxx>
 
 class MSFILTER_DLLPUBLIC DffRecordHeader
 {
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 5009c8ef7b88..b541b36a48a5 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -22,21 +22,35 @@
 
 #include <memory>
 #include <vector>
-#include <tools/solar.h>
-#include <tools/gen.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <svtools/grfmgr.hxx>
-#include <com/sun/star/awt/Size.hpp>
+
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <svx/msdffdef.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svtools/grfmgr.hxx>
+#include <svx/msdffdef.hxx>
+#include <tools/color.hxx>
+#include <tools/gen.hxx>
+#include <tools/solar.h>
+#include <tools/stream.hxx>
+#include <vcl/mapmod.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace awt { struct Rectangle; }
+    namespace beans { class XPropertySet; }
+    namespace drawing { struct EnhancedCustomShapeParameter; }
+    namespace drawing { struct Hatch; }
+} } }
+
+namespace tools {
+    class Polygon;
+    class PolyPolygon;
+}
 
         /*Record Name       FBT-Value   Instance                  Contents                                                          Wrd Exl PPt Ver*/
 // In the Microsoft documentation the naming scheme is msofbt... instead of ESCHER_...
@@ -532,9 +546,6 @@ enum MSOPATHTYPE
 
 const sal_uInt32 DFF_DGG_CLUSTER_SIZE       = 0x00000400;   /// Shape IDs per cluster in DGG atom.
 
-class SvStream;
-class SvMemoryStream;
-
 namespace com { namespace sun { namespace star {
     namespace awt {
         struct Gradient;
@@ -736,7 +747,6 @@ public:
 #define ESCHER_CREATEPOLYGON_POLYLINE       2
 #define ESCHER_CREATEPOLYGON_POLYPOLYGON    4
 
-class GraphicAttr;
 class SdrObjCustomShape;
 
 struct EscherPropSortStruct
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index a87ac3dd3de7..4e0e67aea79b 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -21,11 +21,14 @@
 #define INCLUDED_FILTER_MSFILTER_MSCODEC_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-
+#include <filter/msfilter/msfilterdllapi.h>
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
-#include <filter/msfilter/msfilterdllapi.h>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace beans { struct NamedValue; }
+} } }
 
 namespace msfilter {
 
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index f848f6b2c57c..206bdcbc1103 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -20,41 +20,39 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX
 #define INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX
 
-#include <string.h>
-
+#include <cstring>
 #include <map>
 #include <memory>
 #include <set>
+#include <utility>
 #include <vector>
 
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/stl_types.hxx>
-
-#include <tools/solar.h>
-#include <tools/color.hxx>
-#include <tools/gen.hxx>
-
-#include <vcl/graph.hxx>
-
-#include <svx/msdffdef.hxx>
 #include <filter/msfilter/dffpropset.hxx>
 #include <filter/msfilter/dffrecordheader.hxx>
-
 #include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/msdffdef.hxx>
+#include <tools/color.hxx>
+#include <tools/colordata.hxx>
+#include <tools/errcode.hxx>
+#include <tools/gen.hxx>
+#include <tools/ref.hxx>
+#include <tools/solar.h>
+#include <vcl/graph.hxx>
 
-class Graphic;
+class GDIMetaFile;
 class SotStorage;
 class SvStream;
 class SdrObject;
 class SdrOle2Obj;
 namespace tools {
     class Polygon;
-    class PolyPolygon;
 }
-class FmFormModel;
 class SdrModel;
 class SwFlyFrameFormat;
 
@@ -64,13 +62,13 @@ struct SvxMSDffShapeOrder;
 
 class SvxMSDffManager;
 class SfxItemSet;
-class SdrObject;
-class SdrTextObj;
 struct DffObjData;
 
-namespace com { namespace sun { namespace star { namespace embed {
-    class XStorage;
-} } } }
+namespace com { namespace sun { namespace star {
+    namespace beans { class XPropertySet; }
+    namespace embed { class XEmbeddedObject; }
+    namespace embed { class XStorage; }
+} } }
 
 class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
 {
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index e6e78e94db57..262d6514bd2f 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -36,20 +36,9 @@ namespace com{namespace sun{namespace star{
         }
         namespace container{
                 class XIndexContainer;
-                class XNameContainer;
-        }
-        namespace beans{
-                class XPropertySet;
-        }
-        namespace text{
-                class XText;
         }
         namespace awt{
                 struct Size;
-                class XControlModel;
-        }
-        namespace uno{
-                class XComponentContext;
         }
         namespace frame{
                 class XModel;
@@ -57,8 +46,6 @@ namespace com{namespace sun{namespace star{
 
 }}}
 
-class SfxObjectShell;
-
 class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
 {
 public:
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index f58c9242ceb0..445e86d5f58c 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -19,8 +19,19 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX
 #define INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX
 
-#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Reference.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace embed { class XEmbeddedObject; }
+} } }
+
+namespace svt {
+    class EmbeddedObjectRef;
+}
+
+class SotStorage;
 
 // for the CreateSdrOLEFromStorage we need the information, how we handle
 // convert able OLE-Objects - this ist stored in
@@ -29,10 +40,6 @@
 #define OLE_STARCALC_2_EXCEL                0x0004
 #define OLE_STARIMPRESS_2_POWERPOINT        0x0008
 
-class SotStorage;
-
-#include <svtools/embedhlp.hxx>
-
 class MSFILTER_DLLPUBLIC SvxMSExportOLEObjects
 {
     sal_uInt32 nConvertFlags;
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 2696ae84e697..acf5a2d54dd2 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -8,19 +8,26 @@
  */
 #ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
-#include <filter/msfilter/msfilterdllapi.h>
-#include <ostream>
+
+#include <cstdio>
 #include <memory>
 #include <vector>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 
+namespace com { namespace sun { namespace star {
+    namespace beans { struct PropertyValue; }
+    namespace container { class XIndexAccess; }
+    namespace graphic { class XGraphic; }
+    namespace ui { class XUIConfigurationManager; }
+    namespace ui { class XUIConfigurationManagerSupplier; }
+} } }
 
 class TBCHeader;
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 262388fc7992..366760bfc447 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -19,14 +19,31 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 #define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 
-#include <sfx2/objsh.hxx>
-#include <cppuhelper/implbase.hxx>
+#include <exception>
+
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/vba/XVBAMacroResolver.hpp>
-#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace frame { class XModel; }
+    namespace uno { class XComponentContext; }
+    namespace uno { class XInterface; }
+} } }
+
+class SfxObjectShell;
+
 namespace ooo {
 namespace vba {
 
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index 4628287d8c12..12ccb42c9a14 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -14,6 +14,7 @@
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/textenc.h>
+#include <sal/types.h>
 #include <tools/solar.h>
 
 namespace msfilter {
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index c3c2d38e72e7..6795602308f5 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -20,43 +20,54 @@
 #ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 #define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 
-#include <com/sun/star/io/XInputStream.hpp>
-#include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <tools/gen.hxx>
-#include <tools/color.hxx>
-#include <svx/svdobj.hxx>
-#include <editeng/numitem.hxx>
-#include <editeng/editdata.hxx>
-#include <filter/msfilter/msdffimp.hxx>
-#include <filter/msfilter/msocximex.hxx>
+#include <algorithm>
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <editeng/eeitem.hxx>
 #define ITEMID_FIELD EE_FEATURE_FIELD
 #include <editeng/flditem.hxx>
 #undef ITEMID_FIELD
+#include <filter/msfilter/dffrecordheader.hxx>
+#include <filter/msfilter/msdffimp.hxx>
 #include <filter/msfilter/msfilterdllapi.h>
-#include <vcl/font.hxx>
-#include <vector>
-#include <memory>
-#include <boost/optional.hpp>
+#include <filter/msfilter/msocximex.hxx>
 #include <o3tl/enumarray.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/msdffdef.hxx>
+#include <tools/color.hxx>
+#include <tools/fontenum.hxx>
+#include <tools/gen.hxx>
+#include <tools/ref.hxx>
+#include <tools/solar.h>
+#include <vcl/graph.hxx>
+
+namespace boost {
+    template <class T> class optional;
+}
+
+namespace com { namespace sun { namespace star {
+    namespace awt { struct Size; }
+    namespace drawing { class XShape; }
+    namespace form { class XFormComponent; }
+    namespace frame { class XModel; }
+} } }
 
-class SdrModel;
-class SdPage;
 class SdrPage;
 class SdrObject;
 class SvStream;
-namespace tools {
-    class Polygon;
-    class PolyPolygon;
-}
 class SfxItemSet;
-class Outliner;
-class Graphic;
-class SvxMSDffManager;
+class SdrOutliner;
+class SfxStyleSheet;
+class SotStorage;
+class SvMemoryStream;
+class SvxNumberFormat;
 class PPTTextObj;
-class DffRecordHeader;
-class SvxBulletItem;
 enum class PptSlideLayout;
 enum class PptPlaceholder : sal_uInt8;
 
@@ -320,7 +331,6 @@ public:
     friend SvStream& ReadPptOEPlaceholderAtom( SvStream& rIn, PptOEPlaceholderAtom& rAtom );
 };
 
-struct ProcessData;
 struct PPTStyleSheet;
 struct HeaderFooterEntry;
 struct PptSlidePersistEntry
@@ -427,7 +437,6 @@ struct SdPageCapsule {
     SdrPage * page;
 };
 
-class PPTExtParaProv;
 class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
 {
 protected:
@@ -468,7 +477,6 @@ public:
 };
 
 
-class SvxFieldItem;
 struct MSFILTER_DLLPUBLIC PPTFieldEntry
 {
     sal_uInt16          nPos;
@@ -520,7 +528,6 @@ struct ProcessData
 
 
 class SdrTextObj;
-class SfxObjectShell;
 
 class MSFILTER_DLLPUBLIC SdrPowerPointImport : public SdrEscherImport
 {
@@ -1096,7 +1103,6 @@ struct PPTStyleTextPropReader
             );
 };
 
-class SvxFieldItem;
 class MSFILTER_DLLPUBLIC PPTPortionObj : public PPTCharPropSet
 {
 
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index f42555419ec1..92a116b601eb 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
 #define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
 
-#include <map>
-#include <unordered_map>
-
 #include <filter/msfilter/msfilterdllapi.h>
 #include <rtl/ustring.hxx>
 #include <sot/storage.hxx>
-#include <tools/solar.h>
+#include <tools/errcode.hxx>
 #include <tools/ref.hxx>
 
 class SfxObjectShell;
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 1d482aa4019c..634b424e9367 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -10,14 +10,19 @@
 #ifndef INCLUDED_FILTER_MSFILTER_UTIL_HXX
 #define INCLUDED_FILTER_MSFILTER_UTIL_HXX
 
+#include <filter/msfilter/msfilterdllapi.h>
+#include <svx/msdffdef.hxx>
+#include <rtl/string.hxx>
 #include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <tools/datetime.hxx>
 #include <tools/color.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <filter/msfilter/msfilterdllapi.h>
-#include <svx/msdffdef.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include <filter/msfilter/escherex.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace awt { struct Size; }
+    namespace lang { struct Locale; }
+} } }
 
 namespace msfilter {
 namespace util {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ec29c9e8c8ad..5f66ab5c2874 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
+#include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index b58f1adae669..a1a2026fbd01 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -35,6 +35,8 @@
 #include <filter/msfilter/util.hxx>
 #include <filter/msfilter/escherex.hxx>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 8ac060254513..753e660ba888 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -9,6 +9,7 @@
 #include "xltoolbar.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <stdarg.h>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx
index 1ee3d544ef05..1c7e755226e5 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -9,6 +9,7 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX
 #define INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX
 
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/mstoolbar.hxx>
 
 class ScCTBWrapper;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 35c3a5c8931b..7cee401000cc 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_FILTER_INC_XIESCHER_HXX
 #define INCLUDED_SC_SOURCE_FILTER_INC_XIESCHER_HXX
 
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <filter/msfilter/msdffimp.hxx>
 #include <svx/svdobj.hxx>
 #include <vcl/graph.hxx>
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index f9f733c47bf1..3a484578de26 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
+#include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index a8f38b4b5ced..0c537ed3755f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -92,6 +92,8 @@
 #include <comphelper/string.hxx>
 #include <oox/ole/olehelper.hxx>
 
+#include <boost/optional.hpp>
+
 #include <cassert>
 #include <memory>
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 9d7c88de6003..08dffb112386 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -94,6 +94,7 @@
 #include <svl/whiter.hxx>
 #include <o3tl/enumrange.hxx>
 #include <memory>
+#include <filter/msfilter/escherex.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 85480f5b0e45..2377f21d0317 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -11,6 +11,7 @@
 #include "ww8scan.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <stdarg.h>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index dce6ea9e053c..75cfb29e0880 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -9,6 +9,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8TOOLBAR_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8TOOLBAR_HXX
 
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/mstoolbar.hxx>
 
 class Xst : public TBBase
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 1b6fa4c091ef..50c38abaeb61 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -20,6 +20,7 @@
 #include "vbahelper/vbaapplicationbase.hxx"
 #include <sal/macros.h>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -34,6 +35,7 @@
 #include <com/sun/star/awt/XWindow2.hpp>
 
 #include <filter/msfilter/msvbahelper.hxx>
+#include <rtl/ref.hxx>
 #include <tools/datetime.hxx>
 #include <vcl/timer.hxx>
 
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index 074f5240b12b..8176f9954fcf 100644
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -18,10 +18,12 @@
  */
 
 #include "vbahelper/vbaeventshelperbase.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
+#include <cppuhelper/supportsservice.hxx>
 #include <filter/msfilter/msvbahelper.hxx>
 #include <unotools/eventcfg.hxx>
 #include <vbahelper/vbahelper.hxx>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3874ccf824d2..45be8a691d4e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -25,6 +25,7 @@
 #include <vcl/layout.hxx>
 #include <filter/msfilter/util.hxx>
 #include <comphelper/string.hxx>
+#include <svtools/grfmgr.hxx>
 #include <tools/globname.hxx>
 #include <tools/datetimeutils.hxx>
 #include <comphelper/classids.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index beffd4daa969..d9d99fb852a4 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -10,6 +10,7 @@
 #include <rtfsdrimport.hxx>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
@@ -25,6 +26,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <ooxml/resourceids.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
 #include <comphelper/sequence.hxx>