18 files changed, 92 insertions, 39 deletions
diff --git a/include/oox/helper/addtosequence.hxx b/include/oox/helper/addtosequence.hxx
index 57b77323aafe..dbb271ca09b5 100644
--- a/include/oox/helper/addtosequence.hxx
+++ b/include/oox/helper/addtosequence.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <oox/dllapi.h>
-#include <rtl/ustring.hxx>
 
 namespace oox
 {
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index acb8709020ba..524d7f769a51 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -20,12 +20,16 @@
 #ifndef INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX
 #define INCLUDED_OOX_HELPER_ATTRIBUTELIST_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <oox/helper/helper.hxx>
-#include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace sax { class XFastAttributeList; } }
+} } }
 
 namespace sax_fastparser {
     class FastAttributeList;
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 88e9033be26d..cf247f02797b 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -20,9 +20,18 @@
 #ifndef INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX
 #define INCLUDED_OOX_HELPER_BINARYINPUTSTREAM_HXX
 
+#include <cstddef>
+#include <memory>
 #include <vector>
-#include <com/sun/star/io/XInputStream.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
 #include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/helper.hxx>
+#include <rtl/string.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 358e72c20515..4dfbaf8559cc 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -20,9 +20,17 @@
 #ifndef INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 #define INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 
-#include <oox/helper/binarystreambase.hxx>
+#include <cstddef>
 #include <memory>
 
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/helper.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
 namespace com { namespace sun { namespace star {
     namespace io { class XOutputStream; }
 } } }
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index e49eca63c601..f9fd1e0ebe15 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX
 #define INCLUDED_OOX_HELPER_BINARYSTREAMBASE_HXX
 
+#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <oox/helper/helper.hxx>
 #include <oox/dllapi.h>
-#include <memory>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XSeekable; }
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index 6fc6bd7eb6af..016df0d60d3f 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX
 #define INCLUDED_OOX_HELPER_CONTAINERHELPER_HXX
 
-#include <map>
+#include <cstddef>
 #include <vector>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
-#include <oox/dllapi.h>
 
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
-    namespace container { class XIndexAccess; }
-    namespace container { class XIndexContainer; }
     namespace container { class XNameAccess; }
     namespace container { class XNameContainer; }
-    namespace uno { class XComponentContext; }
+    namespace uno { class Any; }
 } } }
 
 namespace oox {
diff --git a/include/oox/helper/grabbagstack.hxx b/include/oox/helper/grabbagstack.hxx
index 8ad8bd462d61..efcb68dd8ea1 100644
--- a/include/oox/helper/grabbagstack.hxx
+++ b/include/oox/helper/grabbagstack.hxx
@@ -11,12 +11,17 @@
 #ifndef INCLUDED_OOX_HELPER_GRABBAGSTACK_HXX
 #define INCLUDED_OOX_HELPER_GRABBAGSTACK_HXX
 
+#include <stack>
+#include <vector>
+
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <oox/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <sal/types.h>
 
-#include <vector>
-#include <stack>
+namespace com { namespace sun { namespace star {
+    namespace uno { class Any; }
+} } }
 
 namespace oox {
 
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 36f374805c33..6301332fc7eb 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -22,12 +22,15 @@
 
 #include <deque>
 #include <map>
-#include <rtl/ustring.hxx>
+
 #include <com/sun/star/awt/DeviceInfo.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
 #include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/helper.hxx>
 #include <oox/helper/storagebase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 struct WMF_EXTERNALHEADER;
 
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 7c742f5d9e72..0adbceb34757 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_OOX_HELPER_HELPER_HXX
 #define INCLUDED_OOX_HELPER_HELPER_HXX
 
-#include <algorithm>
+#include <cstring>
 #include <limits>
-#include <sal/macros.h>
-#include <osl/endian.h>
+
 #include <rtl/math.hxx>
 #include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
-#include <string.h>
+#include <rtl/textenc.h>
+#include <sal/macros.h>
+#include <sal/types.h>
 
 namespace oox {
 
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index 85ce16808a7b..986e0c7c5945 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -20,8 +20,11 @@
 #ifndef INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX
 #define INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX
 
+#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Gradient; }
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index 2ee50a376426..cbc4244a7ca7 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_OOX_HELPER_PROGRESSBAR_HXX
 
 #include <memory>
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
-
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace task { class XStatusIndicator; }
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 8aa7f3d14a06..cf9b802cd7d5 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_OOX_HELPER_PROPERTYMAP_HXX
 #define INCLUDED_OOX_HELPER_PROPERTYMAP_HXX
 
-#include <vector>
 #include <map>
+
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/ustring.hxx>
-#include <oox/token/properties.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct PropertyValue;
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 1470cfcf3f51..750e5f75a679 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -20,10 +20,18 @@
 #ifndef INCLUDED_OOX_HELPER_PROPERTYSET_HXX
 #define INCLUDED_OOX_HELPER_PROPERTYSET_HXX
 
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.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 <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace beans { class XMultiPropertySet; }
+    namespace beans { class XPropertySet; }
+    namespace beans { class XPropertySetInfo; }
+} } }
 
 namespace oox {
 
diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx
index d1784f73be5d..fb32c9d8c30f 100644
--- a/include/oox/helper/refmap.hxx
+++ b/include/oox/helper/refmap.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_OOX_HELPER_REFMAP_HXX
 #define INCLUDED_OOX_HELPER_REFMAP_HXX
 
-#include <sal/types.h>
-
-#include <functional>
 #include <algorithm>
+#include <functional>
 #include <map>
 #include <memory>
 
diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx
index 9fab74a97ccf..1084e71cecf5 100644
--- a/include/oox/helper/refvector.hxx
+++ b/include/oox/helper/refvector.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_OOX_HELPER_REFVECTOR_HXX
 #define INCLUDED_OOX_HELPER_REFVECTOR_HXX
 
-#include <sal/types.h>
-
-#include <functional>
 #include <algorithm>
+#include <functional>
 #include <memory>
 #include <vector>
 
+#include <sal/types.h>
+
 namespace oox {
 
 
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index b953495fb094..7f88c5ff2123 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -20,10 +20,14 @@
 #ifndef INCLUDED_OOX_HELPER_STORAGEBASE_HXX
 #define INCLUDED_OOX_HELPER_STORAGEBASE_HXX
 
+#include <functional>
+#include <memory>
 #include <vector>
+
 #include <com/sun/star/uno/Reference.hxx>
-#include <oox/helper/refmap.hxx>
 #include <oox/dllapi.h>
+#include <oox/helper/refmap.hxx>
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace embed { class XStorage; }
diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx
index 8412b77a53ba..d059c88e8839 100644
--- a/include/oox/helper/textinputstream.hxx
+++ b/include/oox/helper/textinputstream.hxx
@@ -21,7 +21,9 @@
 #define INCLUDED_OOX_HELPER_TEXTINPUTSTREAM_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
+#include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index 4e4236393cbd..4972254bbc0b 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -20,9 +20,17 @@
 #ifndef INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
 #define INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
 
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/helper/storagebase.hxx>
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star {
+    namespace embed { class XStorage; }
+    namespace io { class XInputStream; }
+    namespace io { class XOutputStream; }
+    namespace io { class XStream; }
     namespace uno { class XComponentContext; }
 } } }