tdf#42949 Fix IWYU warnings in include/avmedia/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ia418fdf7077d1c0c169671770237381c4da7b7b0
Reviewed-on: https://gerrit.libreoffice.org/70582
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

8 files changed, 17 insertions, 15 deletions

diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx
index 29e1ab7b4fc4..73febe30fd76 100644
--- a/include/avmedia/MediaControlBase.hxx
+++ b/include/avmedia/MediaControlBase.hxx
@@ -19,13 +19,14 @@
 #ifndef INCLUDED_AVMEDIA_MEDIACONTROLBASE_HXX
 #define INCLUDED_AVMEDIA_MEDIACONTROLBASE_HXX
 
-#include <svx/svxdllapi.h>
 #include <vcl/edit.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/slider.hxx>
-#include <avmedia/mediaitem.hxx>
-#include <avmedia/mediawindow.hxx>
+
+#include <avmedia/avmediadllapi.h>
+
+namespace avmedia { class MediaItem; }
 
 #define AVMEDIA_TIME_RANGE          2048
 #define AVMEDIA_DB_RANGE            -40
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index 1b7b235b7b6e..575d8f7be239 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -22,13 +22,14 @@
 
 #include <svl/poolitem.hxx>
 #include <com/sun/star/media/ZoomLevel.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <avmedia/avmediadllapi.h>
 #include <memory>
 #include <o3tl/typed_flags_set.hxx>
 
-class SvStream;
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XStream; }
 
 enum class AVMediaSetMask
 {
diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx
index 12164cdc9308..396b94f7a660 100644
--- a/include/avmedia/mediaplayer.hxx
+++ b/include/avmedia/mediaplayer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_AVMEDIA_MEDIAPLAYER_HXX
 #define INCLUDED_AVMEDIA_MEDIAPLAYER_HXX
 
-#include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <avmedia/avmediadllapi.h>
diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index 887db1a0b697..5f39eab95ac1 100644
--- a/include/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX
 #define INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX
 
-#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <avmedia/avmediadllapi.h>
 
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index 83a69ecf7378..1a84a810576d 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -20,24 +20,22 @@
 #ifndef INCLUDED_AVMEDIA_MEDIAWINDOW_HXX
 #define INCLUDED_AVMEDIA_MEDIAWINDOW_HXX
 
-#include <memory>
 #include <vector>
 #include <tools/gen.hxx>
-#include <com/sun/star/media/ZoomLevel.hpp>
-#include <com/sun/star/media/XPlayer.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <vcl/bitmapex.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <vcl/vclptr.hxx>
 #include <avmedia/avmediadllapi.h>
 
 #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
 
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::media { class XPlayer; }
+
+namespace vcl { class Window; }
 namespace weld { class Window; }
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
-class PopupMenu;
 struct AcceptDropEvent;
 struct ExecuteDropEvent;
 enum class PointerStyle;
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index 33f250a89d84..06d416982e25 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -23,6 +23,8 @@
 
 #include <cppuhelper/exc_hlp.hxx>
 
+#include <com/sun/star/io/XInputStream.hpp>
+
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <drawingml/embeddedwavaudiofile.hxx>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 0ace03169023..d8065dbce563 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -19,6 +19,7 @@
 
 #include <config_features.h>
 
+#include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 670a9eb2cd2a..e7562b170e53 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/presentation/SlideShow.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
 #include <svl/aeitem.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/saveopt.hxx>