17 files changed, 175 insertions, 23 deletions
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 7c0018fa0948..9e62a667cd28 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -20,7 +20,6 @@
 #include <writer/WTable.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
@@ -30,6 +29,20 @@
 #include <writer/WConnection.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace text
+{
+class XTextDocument;
+}
+}
+}
+}
+
 using namespace ::com::sun::star;
 
 static void lcl_GetDataArea(const uno::Reference<text::XTextTable>& xTable, sal_Int32& rColumnCount, sal_Int32& rRowCount)
diff --git a/connectivity/source/inc/writer/WDriver.hxx b/connectivity/source/inc/writer/WDriver.hxx
index ea457290b74c..47cae04c6e47 100644
--- a/connectivity/source/inc/writer/WDriver.hxx
+++ b/connectivity/source/inc/writer/WDriver.hxx
@@ -22,7 +22,19 @@
 
 #include <file/FDriver.hxx>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace lang
+{
+class XMultiServiceFactory;
+}
+}
+}
+}
 
 namespace connectivity
 {
diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx
index 272ba85b330b..3711c416c2c5 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
@@ -16,6 +15,20 @@
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace io
+{
+class XInputStream;
+}
+}
+}
+}
+
 using namespace com::sun::star;
 
 namespace
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 2cad73a20a97..2d709f10060e 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -13,7 +13,6 @@
 #include <svtools/rtfkeywd.hxx>
 #include <rtl/character.hxx>
 #include <tools/stream.hxx>
-#include <unotools/streamwrap.hxx>
 
 namespace msfilter
 {
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 8fd58dec647a..60acfe68c984 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -15,12 +15,26 @@
 #include <map>
 #include <vector>
 
-#include <com/sun/star/security/XCertificate.hpp>
+#include <com/sun/star/uno/Reference.h>
 
 #include <tools/stream.hxx>
 
 #include <vcl/dllapi.h>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace security
+{
+class XCertificate;
+}
+}
+}
+}
+
 namespace vcl
 {
 namespace filter
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index 16443a9f084a..e05a706c612e 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -10,10 +10,23 @@
 #ifndef INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX
 #define INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
 #include <oox/core/contexthandler2.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace drawing
+{
+class XShape;
+}
+}
+}
+}
+
 namespace oox
 {
 namespace shape
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 49ce9f1fea25..5d491b10155c 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -242,3 +242,12 @@ blacklist:
     - class SvxCharSetColorItem
     # used in extern declaration
     - struct SfxItemInfo
+    sw/inc/textboxhelper.hxx:
+    # used as a template parameter
+    - class SwFormatContent
+    sw/qa/extras/rtfimport/rtfimport.cxx:
+    # complete type is wanted
+    - com/sun/star/text/XDocumentIndexMark.hpp
+    sw/qa/extras/rtfexport/rtfexport.cxx:
+    # complete type is wanted
+    - com/sun/star/text/XTextColumns.hpp
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index a92c2782b933..1286d81f7762 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -36,15 +36,27 @@
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/text/XFormField.hpp>
 
 #include <rtl/ustring.hxx>
 #include <vcl/settings.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/configuration.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace graphic
+{
+class XGraphic;
+}
+}
+}
+}
+
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/source/filter/html/htmlreqifreader.cxx b/sw/source/filter/html/htmlreqifreader.cxx
index 077483ab158b..e08de4c4ee54 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -11,7 +11,6 @@
 
 #include <comphelper/scopeguard.hxx>
 #include <filter/msfilter/rtfutil.hxx>
-#include <rtl/character.hxx>
 #include <rtl/strbuf.hxx>
 #include <sot/storage.hxx>
 #include <svtools/parrtf.hxx>
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx
index 25c0398cdbdb..08fdf8649818 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -13,10 +13,13 @@
 #include <memory>
 
 #include <rtl/strbuf.hxx>
-#include <rtl/ref.hxx>
 #include <sax/fshelper.hxx>
 #include <tools/solar.h>
 
+namespace rtl
+{
+template <typename> class Reference;
+}
 namespace oox
 {
 namespace drawingml
@@ -25,7 +28,6 @@ class DrawingML;
 }
 }
 class Size;
-class Point;
 class SdrObject;
 class SvxBoxItem;
 
@@ -34,7 +36,6 @@ namespace ww8
 class Frame;
 }
 class SwFrameFormat;
-class SwNode;
 
 class DocxExport;
 
diff --git a/sw/source/filter/ww8/docxtablestyleexport.hxx b/sw/source/filter/ww8/docxtablestyleexport.hxx
index 3746203f8e4e..843ed7cefcdb 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.hxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -12,10 +12,21 @@
 
 #include <memory>
 
-#include <com/sun/star/beans/PropertyValue.hpp>
-
 #include <sax/fshelper.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
 class SwDoc;
 
 /// Handles DOCX export of table styles, based on InteropGrabBag.
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index e8cd635585c6..56172b107037 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -22,10 +22,23 @@
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <shellio.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+class XComponentContext;
+}
+}
+}
+}
+
 /// Dummy Writer implementation to be able to use the string format methods of the base class
 class RtfWriter : public Writer
 {
diff --git a/vcl/inc/pdfread.hxx b/vcl/inc/pdfread.hxx
index 62305fde5d53..2e16e4474c17 100644
--- a/vcl/inc/pdfread.hxx
+++ b/vcl/inc/pdfread.hxx
@@ -11,8 +11,20 @@
 #define INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
 
 #include <tools/stream.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace uno
+{
+template <typename> class Sequence;
+}
+}
+}
+}
 class Bitmap;
 class Graphic;
 
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 31d24cc89701..e3fe26332e2f 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -17,7 +17,6 @@
 #include <fpdf_save.h>
 #endif
 
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/graph.hxx>
 #include <bitmapwriteaccess.hxx>
 
diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx
index 2c6780737488..e942c23aaa0f 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.cxx
@@ -11,6 +11,7 @@
 
 #include <com/sun/star/rdf/Literal.hpp>
 #include <com/sun/star/rdf/URI.hpp>
+#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
 
 #include <ooxml/resourceids.hxx>
 
diff --git a/writerfilter/source/dmapper/SmartTagHandler.hxx b/writerfilter/source/dmapper/SmartTagHandler.hxx
index 388d974c3003..a9c07a3c8a92 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.hxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.hxx
@@ -11,13 +11,31 @@
 
 #include <vector>
 
-#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 #include "LoggedResources.hxx"
 
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace rdf
+{
+class XDocumentMetadataAccess;
+}
+namespace text
+{
+class XTextDocument;
+class XTextRange;
+}
+namespace uno
+{
+class XComponentContext;
+}
+}
+}
+}
+
 namespace writerfilter
 {
 namespace dmapper
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index c7b0674e435f..e34dde0c1cf6 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -11,7 +11,20 @@
 
 #include "LoggedResources.hxx"
 #include <memory>
-#include <com/sun/star/beans/PropertyValue.hpp>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace beans
+{
+struct PropertyValue;
+}
+}
+}
+}
 
 namespace writerfilter
 {