writerfilter: make sure that these headers are self-contained

Change-Id: I3486e8ba5f6d2a937176c9fe549d707a97eb5655

9 files changed, 17 insertions, 8 deletions

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 438037401508..f5a3bd1ca951 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -7,13 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <SdtHelper.hxx>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <editeng/unoprnms.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/datetime.hxx>
 #include <DomainMapper_Impl.hxx>
-#include <SdtHelper.hxx>
 #include <comphelper/sequence.hxx>
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 462f9a77ce35..f22f30664f2c 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -10,12 +10,14 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SDTHELPER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SDTHELPER_HXX
 
-#include <boost/optional.hpp>
 #include <vector>
 
+#include <boost/optional.hpp>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
 
+#include <DomainMapper_Impl.hxx>
 
 namespace com
 {
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index b2de8d83bdcd..421e4856397b 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implementationentry.hxx>
 #include <RtfFilter.hxx>
+#include <cppuhelper/implementationentry.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <dmapper/DomainMapperFactory.hxx>
diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx
index d9814e01cd8b..bfe30c071f97 100644
--- a/writerfilter/source/filter/RtfFilter.hxx
+++ b/writerfilter/source/filter/RtfFilter.hxx
@@ -20,11 +20,12 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_FILTER_RTFFILTER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_FILTER_RTFFILTER_HXX
 
+#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index 812532f52304..432cdc277cf0 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <tools/stream.hxx>
 #include <rtflookahead.hxx>
+#include <tools/stream.hxx>
 
 using namespace com::sun::star;
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index aa898f3403d9..8a03254a0375 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtfsdrimport.hxx>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -26,7 +27,6 @@
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
 #include <comphelper/sequence.hxx>
-#include <rtfsdrimport.hxx>
 #include <rtfreferenceproperties.hxx>
 #include <oox/vml/vmlformatting.hxx>
 #include <oox/helper/modelobjecthelper.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index ed7feb6d1827..8cdaabb3f92e 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -12,8 +12,10 @@
 
 #include <stack>
 
-#include <rtfdocumentimpl.hxx>
+#include <com/sun/star/drawing/XShapes.hpp>
+
 #include <dmapper/GraphicZOrderHelper.hxx>
+#include <rtfdocumentimpl.hxx>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 85fc0506abec..e212f2b7ae97 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtftokenizer.hxx>
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <rtl/strbuf.hxx>
-#include <rtftokenizer.hxx>
 #include <rtfskipdestination.hxx>
 #include <com/sun/star/io/BufferSizeExceededException.hpp>
 
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index bf84eeb29ffb..2be4e7775767 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -11,7 +11,11 @@
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFTOKENIZER_HXX
 
 #include <rtflistener.hxx>
+
+#include <vector>
+
 #include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class SvStream;