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

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

25 files changed, 214 insertions, 63 deletions

diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index 7a49964e5a32..a10c9c6d573e 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -21,17 +21,15 @@
 #ifndef INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX
 #define INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX
 
+#include <array>
 #include <list>
 #include <memory>
-#include <array>
-
-#include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index 4df7a3081e49..ce8925db93b8 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -20,8 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 #define INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
-#include <oox/drawingml/fillproperties.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace drawingml { struct FillProperties; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index a722ff3ae0a1..db8a547f11cd 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -12,7 +12,10 @@
 #define INCLUDED_OOX_PPT_COMMENTS_HXX
 
 #include <vector>
+
 #include <com/sun/star/util/DateTime.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index 136d6e53adf8..5baea22103e5 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -20,9 +20,15 @@
 #ifndef INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
 #define INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
 
-#include <oox/core/fragmenthandler2.hxx>
 #include <vector>
 
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/fragmenthandler2.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+
 namespace oox { namespace ppt {
 
 
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index 7272eeeb8c4e..cac00b12c47e 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -20,14 +20,25 @@
 #ifndef INCLUDED_OOX_PPT_DGMIMPORT_HXX
 #define INCLUDED_OOX_PPT_DGMIMPORT_HXX
 
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
 #include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
-#include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace ole { class VbaProject; }
+    namespace vml { class Drawing; }
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 0ba4d53ae5b2..a0735ea39a20 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -20,14 +20,26 @@
 #ifndef INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 #define INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
-#include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace ole { class VbaProject; }
+    namespace vml { class Drawing; }
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 30a07195e0d7..55203a7742eb 100644
--- a/include/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 #define INCLUDED_OOX_PPT_HEADERFOOTER_HXX
 
-#include <sal/types.h>
-
 namespace oox { namespace ppt {
 
     struct HeaderFooter
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index d385bc537f8f..5ec9351cda23 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -20,9 +20,14 @@
 #ifndef INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
 
+#include <oox/core/contexthandler.hxx>
 #include <oox/ppt/slidefragmenthandler.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
-#include <vector>
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index a832c3b112fd..b1007992319f 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -21,11 +21,14 @@
 #define INCLUDED_OOX_PPT_PPTFILTERHELPERS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/animations/XAnimationNode.hpp>
 #include <oox/dllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
+namespace com { namespace sun { namespace star {
+    namespace animations { class XAnimationNode; }
+} } }
+
 namespace oox { namespace ppt {
 
     // conversion of MS to OOo attributes.
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index 5e6d4224bb64..44b0438f6bc9 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -20,7 +20,14 @@
 #ifndef INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
 
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/graphicshapecontext.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 35bfb91a4d36..2a2860721f5e 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -20,14 +20,33 @@
 #ifndef INCLUDED_OOX_PPT_PPTIMPORT_HXX
 #define INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
+#include <map>
+#include <memory>
+#include <vector>
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
 #include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace beans { struct PropertyValue; }
+    namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+    class GraphicHelper;
+    namespace drawingml { namespace chart { class ChartConverter; } }
+    namespace ole { class VbaProject; }
+    namespace vml { class Drawing; }
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index af2685423c60..e31eeab48682 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -20,8 +20,27 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPE_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace basegfx { class B2DHomMatrix; }
+
+namespace com { namespace sun { namespace star {
+    namespace awt { struct Rectangle; }
+    namespace drawing { class XShapes; }
+} } }
+
+namespace oox {
+    namespace core { class XmlFilterBase; }
+    namespace drawingml { class Theme; }
+    template <typename Type> class OptValue;
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 2ff237fa09c0..f3a643f9f175 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -20,8 +20,14 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/shapecontext.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 20b2d7c29015..91d78e904b0c 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -20,9 +20,17 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/shapegroupcontext.hxx>
-#include <oox/drawingml/color.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox {
+    class AttributeList;
+    namespace core { class ContextHandler2Helper; }
+    namespace drawingml { class Color; }
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index b41a18665ca8..dffa4795ae28 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -21,6 +21,14 @@
 #define INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
 #include <drawingml/shapepropertiescontext.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <sal/types.h>
+
+namespace oox {
+    class AttributeList;
+    namespace core { class ContextHandler2Helper; }
+    namespace drawingml { class Shape; }
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index 912c181494ad..0457235e23ce 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -20,17 +20,21 @@
 #ifndef INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <vector>
+
 #include <com/sun/star/awt/Size.hpp>
-#include <oox/ppt/slidepersist.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
-#include <oox/core/relations.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/ppt/customshowlistcontext.hxx>
 #include <oox/ppt/comments.hxx>
-#include <stack>
-#include <vector>
+#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx
index a0d1394d19cf..fb6b6f97917b 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -20,14 +20,17 @@
 #ifndef INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <oox/helper/propertymap.hxx>
+#include <vector>
+
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
+#include <oox/helper/propertymap.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
-#include <stack>
-#include <vector>
-#include <map>
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index d719e4616666..d00f3fc623c8 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 #define INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
-#include <oox/drawingml/theme.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 1e75c2c281ba..09344a7f85fd 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -20,19 +20,27 @@
 #ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 #define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
+#include <list>
+#include <map>
 #include <memory>
-#include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/theme.hxx>
+
+#include <cppuhelper/weakref.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/drawingml/clrscheme.hxx>
-#include <oox/ppt/headerfooter.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <oox/core/fragmenthandler.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/shape.hxx>
 #include <oox/ppt/comments.hxx>
+#include <oox/ppt/headerfooter.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
-#include <list>
+namespace com { namespace sun { namespace star {
+    namespace animations { class XAnimationNode; }
+    namespace drawing { class XDrawPage; }
+} } }
 
+namespace oox { namespace core { class XmlFilterBase; } }
 namespace oox { namespace vml { class Drawing; } }
 
 namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index 359804593ca6..b13b8ad43a4a 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
 #define INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
 
-#include <com/sun/star/animations/XTimeContainer.hpp>
-#include <oox/ppt/timenode.hxx>
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/timenode.hxx>
+#include <sal/types.h>
 
-#include <stack>
-#include <vector>
+namespace oox { class AttributeList; }
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 1e322e0996b1..41df7b2f7948 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -21,9 +21,13 @@
 #ifndef INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
 #define INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/types.h>
 
-#include <com/sun/star/animations/XTransitionFilter.hpp>
+namespace com { namespace sun { namespace star {
+    namespace animations { class XTransitionFilter; }
+} } }
 
 namespace oox { class PropertyMap; }
 
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 8cb53e78969e..1588cba3ec13 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -20,10 +20,15 @@
 #ifndef INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
 #define INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
 
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/slidetransition.hxx>
+#include <sal/types.h>
 
-namespace oox { class PropertyMap; }
+namespace oox {
+    class AttributeList;
+    class PropertyMap;
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 51e0e0da0890..7d7f714d7803 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -21,9 +21,15 @@
 #ifndef INCLUDED_OOX_PPT_SOUNDACTIONCONTEXT_HXX
 #define INCLUDED_OOX_PPT_SOUNDACTIONCONTEXT_HXX
 
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
-namespace oox { class PropertyMap; }
+namespace oox {
+    class AttributeList;
+    class PropertyMap;
+}
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index c04d4f526deb..546f73a45674 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -21,22 +21,27 @@
 #ifndef INCLUDED_OOX_PPT_TIMENODE_HXX
 #define INCLUDED_OOX_PPT_TIMENODE_HXX
 
-#include <memory>
-#include <vector>
 #include <list>
-#include <rtl/ustring.hxx>
+#include <map>
+#include <memory>
 
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <oox/helper/propertymap.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/ppt/slidetransition.hxx>
 #include <oox/ppt/slidepersist.hxx>
 #include <oox/ppt/animationspersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace animations { class XAnimationNode; }
+} } }
+
+namespace oox { namespace core { class XmlFilterBase; } }
 
 namespace oox { namespace ppt {
 
     class TimeNode;
-    class SlideTransition;
 
     typedef std::shared_ptr< TimeNode > TimeNodePtr;
     typedef std::list< TimeNodePtr > TimeNodePtrList;
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 5406771013fd..fe27bba634e6 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -20,10 +20,17 @@
 #ifndef INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX
 #define INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/ppt/timenode.hxx>
+#include <sal/types.h>
 
-#include <com/sun/star/animations/XTimeContainer.hpp>
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+} } }
+
+namespace oox { class AttributeList; }
 
 namespace oox { namespace ppt {