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>

14 files changed, 158 insertions, 116 deletions

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 {