diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 7c9e4983c759..528dc84473f5 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -20,48 +20,52 @@
 #ifndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
 #define INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
 
-#include <oox/dllapi.h>
-#include <com/sun/star/uno/XReference.hpp>
-#include <oox/export/drawingml.hxx>
-#include <oox/token/tokens.hxx>
-#include <sax/fshelper.hxx>
-#include <vcl/mapmod.hxx>
-
-#include <com/sun/star/chart2/RelativePosition.hpp>
-#include <com/sun/star/chart2/RelativeSize.hpp>
-
 #include <set>
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <oox/dllapi.h>
+#include <oox/export/drawingml.hxx>
+#include <oox/export/utils.hxx>
+#include <oox/token/tokens.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <sax/fshelper.hxx>
 
 namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
     namespace chart {
         class XDiagram;
         class XChartDocument;
-        class XChartDataArray;
-        struct ChartSeriesAddress;
     }
     namespace chart2 {
+        struct RelativePosition;
+        struct RelativeSize;
         class XDiagram;
         class XChartDocument;
         class XDataSeries;
         class XChartType;
         namespace data
         {
-            class XDataProvider;
             class XDataSequence;
         }
     }
     namespace drawing {
         class XShape;
-        class XShapes;
-    }
-    namespace task {
-        class XStatusIndicator;
     }
     namespace frame {
         class XModel;
     }
 }}}
 
+namespace oox {
+namespace core {
+    class XmlFilterBase;
+}}
+
 namespace oox { namespace drawingml {
 
 enum AxesType
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index e406ba75cddd..10b5e953df63 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -20,16 +20,22 @@
 #ifndef INCLUDED_OOX_EXPORT_DRAWINGML_HXX
 #define INCLUDED_OOX_EXPORT_DRAWINGML_HXX
 
+#include <map>
+
+#include <com/sun/star/beans/PropertyState.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <oox/dllapi.h>
-#include <sax/fshelper.hxx>
-#include <rtl/strbuf.hxx>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/uno/XReference.hpp>
-#include <filter/msfilter/escherex.hxx>
-#include "oox/drawingml/drawingmltypes.hxx"
+#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/export/utils.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <sax/fshelper.hxx>
+#include <svx/msdffdef.hxx>
+#include <vcl/checksum.hxx>
 
 #ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
 // Our rotation is counter-clockwise and is in 100ths of a degree.
@@ -40,7 +46,12 @@
 class Graphic;
 
 namespace com { namespace sun { namespace star {
+namespace awt {
+    struct FontDescriptor;
+    struct Gradient;
+}
 namespace beans {
+    struct PropertyValue;
     class XPropertySet;
     class XPropertyState;
 }
@@ -57,9 +68,14 @@ namespace text {
 namespace io {
     class XOutputStream;
 }
+namespace uno {
+    class XInterface;
+}
 }}}
 
+struct EscherConnectorListEntry;
 class OutlinerParaObject;
+class Rectangle;
 
 namespace tools {
     class PolyPolygon;
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index b2cb828a8dd3..d6ae6151b7bc 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -20,27 +20,48 @@
 #ifndef INCLUDED_OOX_EXPORT_SHAPES_HXX
 #define INCLUDED_OOX_EXPORT_SHAPES_HXX
 
-#include <oox/dllapi.h>
-#include <com/sun/star/uno/XReference.hpp>
-#include <oox/export/drawingml.hxx>
-#include <sax/fshelper.hxx>
-#include <vcl/mapmod.hxx>
-#include <tools/fract.hxx>
+#include <cstddef>
+#include <memory>
 #include <unordered_map>
 
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
+#include <oox/export/drawingml.hxx>
+#include <oox/export/utils.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <sax/fshelper.hxx>
+#include <tools/fract.hxx>
+#include <vcl/mapmod.hxx>
+
 namespace com { namespace sun { namespace star {
 namespace beans {
     class XPropertySet;
 }
 namespace drawing {
     class XShape;
-    class XShapes;
 }
+
 namespace embed {
     class XEmbeddedObject;
 }
+namespace io {
+    class XInputStream;
+}
+namespace uno {
+    class XComponentContext;
+    class XInterface;
+}
 }}}
 
+namespace oox {
+namespace core {
+    class XmlFilterBase;
+}}
+
+class Graphic;
+
 namespace oox {
 
 OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream> GetOLEObjectStream(
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 32a9fbed2a0f..599e45ee55f8 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_OOX_EXPORT_UTILS_HXX
 #define INCLUDED_OOX_EXPORT_UTILS_HXX
 
-#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
+#include <rtl/textenc.h>
+#include <sal/types.h>
 
 #define I32S(x) OString::number( (sal_Int32) x ).getStr()
 #define I64S(x) OString::number( (sal_Int64) x ).getStr()
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 1c2053406f05..37b2af0b8305 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -20,12 +20,36 @@
 #ifndef INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
 #define INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
 
-#include <oox/dllapi.h>
-#include <oox/export/drawingml.hxx>
-#include <sax/fshelper.hxx>
-#include <filter/msfilter/escherex.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <editeng/outlobj.hxx>
+#include <filter/msfilter/escherex.hxx>
+#include <oox/dllapi.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <sax/fshelper.hxx>
+#include <vcl/checksum.hxx>
 
+namespace com { namespace sun { namespace star {
+    namespace drawing {
+        class XShape;
+    }
+}}}
+
+namespace oox {
+    namespace drawingml {
+        class DrawingML;
+    }
+}
+
+namespace sax_fastparser {
+    class FastAttributeList;
+}
+
+class Point;
+class Rectangle;
+class SdrObject;
 
 namespace oox {
 
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index e483b9e46943..3b7994013236 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -47,6 +47,8 @@
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 
+#include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/chart2/RelativeSize.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 6597aca2b4c2..a907f480cc16 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -19,6 +19,7 @@
 
 #include <config_folders.h>
 #include "rtl/bootstrap.hxx"
+#include <oox/export/drawingml.hxx>
 #include <oox/export/vmlexport.hxx>
 
 #include <oox/token/tokens.hxx>