15 files changed, 20 insertions, 1 deletions
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 946a4bbfa916..fa40f76090d3 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -21,6 +21,7 @@
 
 #include <txatbase.hxx>
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index ec44bb2cbbea..067cd57bd53e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -19,6 +19,7 @@
 
 #include <fmtwrapinfluenceonobjpos.hxx>
 #include <unomid.h>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index eec3b792a1f7..bf468b9604ad 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -29,6 +29,7 @@
 #include <unicode/uchar.h>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
+#include <osl/diagnose.h>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 7c1c3e1253ce..176f4c4c75f5 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -17,8 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/strbuf.hxx>
 #include <swcache.hxx>
+
+#include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
+
 #include <limits.h>
 
 #ifdef DBG_UTIL
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index efbeb7d873f8..b055c15d4939 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -19,6 +19,7 @@
 
 #include <finalthreadmanager.hxx>
 
+#include <osl/diagnose.h>
 #include <osl/thread.hxx>
 #include <pausethreadstarting.hxx>
 #include <swthreadjoiner.hxx>
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 2f43f77ae703..f9cf4f02a808 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -18,6 +18,8 @@
  */
 #include <threadmanager.hxx>
 
+#include <osl/diagnose.h>
+
 #include <algorithm>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 013ad4af5762..95d8c4046f62 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -20,6 +20,8 @@
 #include <flddropdown.hxx>
 
 #include <algorithm>
+
+#include <osl/diagnose.h>
 #include <svl/poolitem.hxx>
 
 #include <unofldmid.h>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 0e300929aa05..948a62062211 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -22,6 +22,7 @@
 
 #include <tools/solar.h>
 #include <tools/debug.hxx>
+#include <osl/diagnose.h>
 
 class SwTxtFrm;
 class OutputDevice;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index eb7b6a674484..86ac8ec3c964 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -24,6 +24,7 @@
 #include <deque>
 #include "swscanner.hxx"
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 
 class SwTxtNode;
 class Point;
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 145f1a576920..031a5e56e465 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -20,6 +20,7 @@
 #include "swtypes.hxx"
 
 #include "SwGrammarMarkUp.hxx"
+#include <osl/diagnose.h>
 
 SwWrongArea::SwWrongArea( const rtl::OUString& rType, WrongListType listType,
         com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index ad50e95d9ffb..79e8a6a1548b 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -20,6 +20,7 @@
 #include "XMLRangeHelper.hxx"
 #include <unotools/charclass.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 40e0761e192c..8a1bd2a618b7 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -32,6 +32,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/datetime.hxx>
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/content.hxx>
 #include <swunohelper.hxx>
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 96e039b6034b..cb7cdf03f672 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -77,6 +77,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
+#include <osl/diagnose.h>
 #include <swtypes.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index a0a1f19969e3..a837f0350cfd 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -22,6 +22,7 @@
 #include <functional>
 #include <algorithm>
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include "staticassert.hxx"
 
 namespace
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index d7e84d67ec47..33f875bbbb5b 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -19,6 +19,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <osl/diagnose.h>
 #include <comphelper/servicedecl.hxx>
 
 // component exports