sal: clean up public headers with include-what-you-use

Sadly cannot forward declare "struct {...} TimeValue;".

rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h
was painful enough for now...

Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05

87 files changed, 104 insertions, 0 deletions

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index bd6ea315a207..123ff9911861 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -51,6 +51,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/fieldupdater.hxx>
+#include <osl/diagnose.h>
 
 #include <cstring>
 #include <map>
diff --git a/sc/source/core/data/columniterator.cxx b/sc/source/core/data/columniterator.cxx
index 6b5c1a47176b..4e363f8f319e 100644
--- a/sc/source/core/data/columniterator.cxx
+++ b/sc/source/core/data/columniterator.cxx
@@ -12,6 +12,8 @@
 #include "document.hxx"
 #include "table.hxx"
 
+#include <osl/diagnose.h>
+
 ScColumnTextWidthIterator::ScColumnTextWidthIterator(ScColumn& rCol, SCROW nStartRow, SCROW nEndRow) :
     mrCellTextAttrs(rCol.maCellTextAttrs),
     mnEnd(static_cast<size_t>(nEndRow)),
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index 44efca627033..d3e51de75db1 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -28,6 +28,7 @@
 #include "queryentry.hxx"
 #include "dpitemdata.hxx"
 
+#include <osl/diagnose.h>
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index f59a4ba97d08..23d06a390b76 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -29,6 +29,7 @@
 #include "dputil.hxx"
 #include "globalnames.hxx"
 
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 2afe33f214fc..154cc13f85eb 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -27,6 +27,7 @@
 #include "dputil.hxx"
 
 #include <sal/types.h>
+#include <osl/diagnose.h>
 #include <comphelper/string.hxx>
 
 #include <com/sun/star/sheet/GeneralFunction.hpp>
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index c5f46df808dc..120175e329a2 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -30,6 +30,7 @@
 #include "queryentry.hxx"
 
 #include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+#include <osl/diagnose.h>
 
 #include <vector>
 #include <set>
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 2fc2348697a7..3558c86777b1 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 #include <tools/date.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/collatorwrapper.hxx>
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 4b4010765a30..362437f84a81 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -18,6 +18,7 @@
 #include <unotools/calendarwrapper.hxx>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 8dc24d421ba2..777583f1697c 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -19,6 +19,7 @@
 
 #include "callform.hxx"
 #include "global.hxx"
+#include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index 407fad527fa9..6a83437216fc 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -21,6 +21,8 @@
 #include "global.hxx"
 #include "address.hxx"
 
+#include <osl/diagnose.h>
+
 // STATIC DATA -----------------------------------------------------------
 
 ScMarkArray::ScMarkArray() :
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 022a82002ca8..08b83497990b 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -23,6 +23,8 @@
 #include <columnspanset.hxx>
 #include <fstalgorithm.hxx>
 
+#include <osl/diagnose.h>
+
 #include <mdds/flat_segment_tree.hpp>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 6a9e8b96e4ad..55f86356a187 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -25,6 +25,8 @@
 #include "address.hxx"
 #include "table.hxx"
 
+#include <osl/diagnose.h>
+
 ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) :
     nStart  ( nNewStart ),
     nSize   ( nNewSize ),
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index 4bdb61f53e89..2a75d8a44d2f 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -19,6 +19,7 @@
 
 #include "sheetevents.hxx"
 #include <com/sun/star/script/vba/VBAEventId.hpp>
+#include <osl/diagnose.h>
 
 OUString ScSheetEvents::GetEventName(sal_Int32 nEvent)
 {
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 15e423f8ae29..e4e4dcc1f195 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -23,6 +23,8 @@
 #include "queryparam.hxx"
 #include "subtotalparam.hxx"
 
+#include <osl/diagnose.h>
+
 ScSortParam::ScSortParam()
 {
     Clear();
diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx
index 27bbeb361b24..95eba3f6c3ae 100644
--- a/sc/source/core/data/subtotalparam.cxx
+++ b/sc/source/core/data/subtotalparam.cxx
@@ -9,6 +9,8 @@
 
 #include "subtotalparam.hxx"
 
+#include <osl/diagnose.h>
+
 ScSubTotalParam::ScSubTotalParam()
 {
     for ( sal_uInt16 i=0; i<MAXSUBTOTAL; i++ )
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 835cbfed8062..c678680d5f40 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -22,6 +22,7 @@
 #include <unotools/textsearch.hxx>
 #include <svl/srchitem.hxx>
 #include <editeng/editobj.hxx>
+#include <osl/diagnose.h>
 
 #include "table.hxx"
 #include "formulacell.hxx"
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 9b00683450a7..6ee899d82a33 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -20,6 +20,7 @@
 #include "tabprotection.hxx"
 #include <svl/PasswordHelper.hxx>
 #include <comphelper/docpasswordhelper.hxx>
+#include <osl/diagnose.h>
 #include "document.hxx"
 
 #include <vector>
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index c8c8f185125b..6ed9449afcf7 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -25,6 +25,7 @@
 
 #include "globstr.hrc"
 #include <sal/alloca.h>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 512d3cd54d49..5bcb4f986988 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -24,6 +24,7 @@
 #include "global.hxx"
 #include "document.hxx"
 #include "sc.hrc"
+#include <osl/diagnose.h>
 #include <osl/thread.h>
 
 ScAddInAsyncs theAddInAsyncTbl;
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index b36b6e9e4685..8debf6b063e5 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -20,6 +20,8 @@
 #include "chartpos.hxx"
 #include "document.hxx"
 #include "rechead.hxx"
+#include <osl/diagnose.h>
+
 #include <boost/scoped_array.hpp>
 
 namespace
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 08215131094b..d2db66a9ca41 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -25,6 +25,7 @@
 #include <formula/errorcodes.hxx>
 #include "formulacell.hxx"
 #include "tokenarray.hxx"
+#include <osl/diagnose.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx
index 0226832febc1..8ba6dc752cac 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -9,6 +9,7 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
 
 #include "defaultsoptions.hxx"
 #include "miscuno.hxx"
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index 5451eb1692a4..5de3489d0dd6 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -27,6 +27,7 @@
 #include "scmatrix.hxx"
 
 #include <svl/sharedstringpool.hxx>
+#include <osl/diagnose.h>
 
 #include <memory>
 #include <vector>
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index f87a68b15c9c..a4db66e4112d 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
 
 #include "filtopt.hxx"
 #include "miscuno.hxx"
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 75af8ff355ae..c5ff895ca466 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -13,6 +13,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
+#include <osl/diagnose.h>
 
 #include "formulaopt.hxx"
 #include "miscuno.hxx"
diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx
index dae7f109bd8e..dc90c8686c36 100644
--- a/sc/source/core/tool/jumpmatrix.cxx
+++ b/sc/source/core/tool/jumpmatrix.cxx
@@ -20,6 +20,8 @@
 #include "jumpmatrix.hxx"
 #include "scmatrix.hxx"
 
+#include <osl/diagnose.h>
+
 namespace {
 // Don't bother with buffer overhead for less than y rows.
 const SCSIZE kBufferThreshhold = 128;
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 00daafe9b7d6..2b60712c612f 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <osl/diagnose.h>
 
 #include "printopt.hxx"
 #include "miscuno.hxx"
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index d85e60b4c0e4..9b2ccfdc1ddf 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -21,6 +21,8 @@
 #include "global.hxx"
 #include "address.hxx"
 
+#include <osl/diagnose.h>
+
 // STATIC DATA
 
 //      Daten pro Tabelle
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 5f8c769fe03b..00c7ba333880 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -22,6 +22,7 @@
 #include "scmatrix.hxx"
 
 #include <svl/sharedstringpool.hxx>
+#include <osl/diagnose.h>
 
 namespace {
 
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index ab5653f52cfc..7cf7bcd0ac07 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <comphelper/string.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <osl/diagnose.h>
 
 #include "rangelst.hxx"
 #include "document.hxx"
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 768fe7085837..16af01a8a699 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -22,6 +22,7 @@
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
+#include <osl/diagnose.h>
 
 #include "token.hxx"
 #include "tokenarray.hxx"
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 4ebc2d6bfc7e..8c5818d13f51 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index b0b8c13ea7f0..32d3d96fe7b3 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -20,6 +20,8 @@
 #include "rechead.hxx"
 #include "scerrors.hxx"
 
+#include <osl/diagnose.h>
+
 // STATIC DATA
 
 ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index b8c21d7e3609..cf00ee058146 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -23,6 +23,8 @@
 #include "bigrange.hxx"
 #include "chgtrack.hxx"
 
+#include <osl/diagnose.h>
+
 template< typename R, typename S, typename U >
 static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
 {
diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx
index 8cfd6798504b..bf49fac15fe8 100644
--- a/sc/source/core/tool/stylehelper.cxx
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rsc/rscsfx.hxx>
+#include <osl/diagnose.h>
 
 #include "stylehelper.hxx"
 #include "global.hxx"
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 6cc1c82a4916..79907ce39208 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -32,6 +32,7 @@
 #include "ftools.hxx"
 #include "cellvalue.hxx"
 #include <rtl/strbuf.hxx>
+#include <osl/diagnose.h>
 
 FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
     const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption )
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 52ea17d77f20..59d8238ca9da 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -20,6 +20,7 @@
 #include <math.h>
 
 #include <svl/zforlist.hxx>
+#include <osl/diagnose.h>
 #include "attrib.hxx"
 #include "dif.hxx"
 #include "docpool.hxx"
diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx
index 45a62f135a42..22eef61d8023 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -20,6 +20,8 @@
 #include "xerecord.hxx"
 #include "xeroot.hxx"
 
+#include <osl/diagnose.h>
+
 using namespace ::oox;
 
 // Base classes to export Excel records =======================================
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 2e4cb8104ab8..2e716b09ce8d 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -19,6 +19,8 @@
 
 #include <algorithm>
 #include <stdio.h>
+
+#include <osl/diagnose.h>
 #include "xlstyle.hxx"
 #include "xestyle.hxx"
 #include "xestream.hxx"
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 08b912bb55e7..7b42b8812d2a 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/docpasswordhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <osl/thread.h>
+#include <osl/diagnose.h>
 #include "xistream.hxx"
 #include "xlstring.hxx"
 #include "xiroot.hxx"
diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index c73618bfcdbf..4e0fb7dbee4d 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -22,6 +22,8 @@
 #include "xltracer.hxx"
 #include "xistream.hxx"
 
+#include <osl/diagnose.h>
+
 void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit )
 {
     mnRow = rStrm.ReaduInt16();
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 1112d62b7c36..38924a63a3bf 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -23,6 +23,7 @@
 #include "xistream.hxx"
 #include "xestring.hxx"
 #include "xlpivot.hxx"
+#include <osl/diagnose.h>
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
 using ::com::sun::star::sheet::GeneralFunction;
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index a0a3230cc186..dca88f213692 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -19,6 +19,7 @@
 
 #include "xlview.hxx"
 #include "ftools.hxx"
+#include <osl/diagnose.h>
 
 // Structs ====================================================================
 
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 1dfc9055a960..645323b9cf1c 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -20,6 +20,7 @@
 #include "fprogressbar.hxx"
 #include "global.hxx"
 #include "progress.hxx"
+#include <osl/diagnose.h>
 
 ScfProgressBar::ScfProgressSegment::ScfProgressSegment( sal_Size nSize ) :
     mnSize( nSize ),
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 6cd5236c62b7..21c43c45e089 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "ftools.hxx"
+#include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
 #include <tools/color.hxx>
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index fd2fd85d24ff..18b2988dd6fb 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
+#include <osl/diagnose.h>
 #include <tools/color.hxx>
 #include <comphelper/types.hxx>
 #include "ftools.hxx"
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index 53ee81c24aec..332fef0b5c2a 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_NAMEBUFF_HXX
 
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include "compiler.hxx"
 #include "root.hxx"
 #include "xiroot.hxx"
diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx
index 049c00de8898..e9abc4f56f86 100644
--- a/sc/source/filter/inc/richstringcontext.hxx
+++ b/sc/source/filter/inc/richstringcontext.hxx
@@ -22,6 +22,7 @@
 
 #include "excelhandlers.hxx"
 #include "richstring.hxx"
+#include <osl/diagnose.h>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 8609d9302f29..9bf137d5a3f0 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -23,6 +23,7 @@
 #include <string.h>
 #include "compiler.hxx"
 #include "tokenarray.hxx"
+#include <osl/diagnose.h>
 
 #include <vector>
 
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 5515834ccc4c..98a6756473a8 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -22,6 +22,7 @@
 
 #include <attrib.hxx>
 #include <document.hxx>
+#include <osl/diagnose.h>
 
 // Defaultwerte
 const sal_uInt8 nDezStd = 0;        // Dezimalstellen fuer Standard-Zellen
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index a508cb83406a..5576f51cf011 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_FILTER_INC_XLFORMULA_HXX
 
 #include <map>
+#include <osl/diagnose.h>
 #include <formula/opcode.hxx>
 #include "address.hxx"
 #include "ftools.hxx"
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 37fee41ef548..dd14ad05df2e 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp>
 #include <com/sun/star/table/TableOrientation.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index 5a6258799e9b..ebbf63143004 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -21,6 +21,7 @@
 
 #include <rtl/math.hxx>
 #include <rtl/tencinfo.h>
+#include <osl/diagnose.h>
 #include "biffinputstream.hxx"
 #include "worksheethelper.hxx"
 #include <oox/helper/binaryoutputstream.hxx>
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index fd3f3853eba8..1e86645cfab4 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 
 namespace oox {
 namespace xls {
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 4aea74433b0b..bd5e1c3dbadf 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
 #include <com/sun/star/sheet/XSheetAnnotations.hpp>
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include <oox/vml/vmlshape.hxx>
 #include "addressconverter.hxx"
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index dd8aac429d25..60e3e7c41b70 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 #include <svl/intitem.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index d8e164b5f14c..dd3d11430578 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -19,6 +19,7 @@
 
 #include "connectionsbuffer.hxx"
 
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include "biffinputstream.hxx"
 
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 53f0d56350b1..85bc04e0b5b2 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/SingleReference.hpp>
 #include <com/sun/star/sheet/XFormulaTokens.hpp>
 #include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 30e75e6cf464..1755d2d78b0e 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -20,6 +20,7 @@
 #include "drawingbase.hxx"
 
 #include <com/sun/star/awt/Rectangle.hpp>
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include "unitconverter.hxx"
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 17f1b55eeb94..62e24483c572 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/PolygonKind.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
+#include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
 #include <oox/drawingml/fillproperties.hxx>
 #include <oox/drawingml/lineproperties.hxx>
diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx
index 24fe4a286e60..c316cb7be381 100644
--- a/sc/source/filter/oox/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/data/XSheetDataProvider.hpp>
 
+#include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
 #include <oox/drawingml/chart/datasourcemodel.hxx>
 #include <oox/helper/containerhelper.hxx>
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 335c90e287bd..06ab0db88409 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -20,6 +20,7 @@
 #include "excelfilter.hxx"
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <osl/diagnose.h>
 
 #include <oox/helper/binaryinputstream.hxx>
 #include "biffinputstream.hxx"
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 9b034e2c8ab1..fa486d037190 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/sheet/XDDELinkResults.hpp>
 #include <com/sun/star/sheet/XExternalDocLink.hpp>
 #include <com/sun/star/sheet/XExternalDocLinks.hpp>
+#include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 641e70e1cd89..5b07c1ed4e5e 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/containerhelper.hxx>
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index ba99aa6fe54a..54743dcf4217 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/NameToken.hpp>
 #include <com/sun/star/sheet/ReferenceFlags.hpp>
 #include <com/sun/star/sheet/SingleReference.hpp>
+#include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
 #include <oox/token/properties.hxx>
 #include "addressconverter.hxx"
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 0464e55c01da..b34ddb901f4c 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -29,6 +29,7 @@
 #include <officecfg/System.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
+#include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/ustrbuf.hxx>
 #include <svl/intitem.hxx>
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index a95c05c2e7ac..2db4f534d55a 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -20,6 +20,7 @@
 #include "ooxformulaparser.hxx"
 
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <osl/diagnose.h>
 #include <cppuhelper/supportsservice.hxx>
 #include "formulaparser.hxx"
 
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index cab987616a80..48e7b591bd12 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 452fa14b298c..d6ee51d1c70a 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -19,6 +19,7 @@
 
 #include "pivotcachefragment.hxx"
 
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include "addressconverter.hxx"
 #include "biffinputstream.hxx"
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 57c7c1894ba9..b2e7cb915657 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/sheet/XAreaLink.hpp>
 #include <com/sun/star/sheet/XAreaLinks.hpp>
+#include <osl/diagnose.h>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/properties.hxx>
diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index 4e59dbf53525..733b70dff4de 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
 #include <com/sun/star/sheet/XDatabaseRanges.hpp>
+#include <osl/diagnose.h>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index a776cbb0eeb7..84a1f2617315 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/awt/XFont.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 8ff5c55b7ca6..75fa731dde58 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
+#include <osl/diagnose.h>
 #include <unotools/mediadescriptor.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index cc8147ecd502..85385aaf35f2 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/sheet/XExternalSheetName.hpp>
 #include <com/sun/star/sheet/XSheetLinkable.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 6f85adc4112b..aaa45a9b79ba 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XText.hpp>
+#include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index e4fe55c0cd1a..c6974192467d 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -24,6 +24,7 @@
 #include "chgviset.hxx"
 #include "rangeutl.hxx"
 #include <tools/datetime.hxx>
+#include <osl/diagnose.h>
 #include <svl/zforlist.hxx>
 #include <sax/tools/converter.hxx>
 
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 8dba4945fccb..0f964f94b2a3 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -26,6 +26,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <sax/tools/converter.hxx>
 #include <svl/sharedstringpool.hxx>
+#include <osl/diagnose.h>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index 93f478c00ef0..5f2b06f2244a 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -19,6 +19,7 @@
 
 #include "XMLExportSharedData.hxx"
 #include "XMLExportIterator.hxx"
+#include <osl/diagnose.h>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 99019dd00bcd..fa5c289b4820 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -20,6 +20,7 @@
 #include "XMLStylesImportHelper.hxx"
 #include "xmlimprt.hxx"
 #include <com/sun/star/util/NumberFormat.hpp>
+#include <osl/diagnose.h>
 
 using namespace com::sun::star;
 using ::std::list;
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index dc9ba8556e9c..7a839e9356ae 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -27,6 +27,8 @@
 #include "compiler.hxx"
 #include "reftokenhelper.hxx"
 
+#include <osl/diagnose.h>
+
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/table/XColumnRowRange.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index 4d78337b996a..dd820f9454ed 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include <xmloff/families.hxx>
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 0ab024faf045..f63756122a3b 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -23,6 +23,7 @@
 #include "dpsave.hxx"
 #include "queryparam.hxx"
 
+#include <osl/diagnose.h>
 #include <editeng/editobj.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index c17c0b7563f9..a5e5b9fbd796 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -22,6 +22,7 @@
 
 #include <basic/basmgr.hxx>
 #include <cppuhelper/implbase1.hxx>
+#include <osl/diagnose.h>
 #include <sfx2/objsh.hxx>
 #include "formulacell.hxx"
 #include <com/sun/star/container/XContainer.hpp>
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index b0c6110490db..883bd09d1357 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -21,6 +21,8 @@
 
 #include "pagedata.hxx"
 
+#include <osl/diagnose.h>
+
 ScPrintRangeData::ScPrintRangeData()
 {
     nPagesX = nPagesY = 0;
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index 1f18e178897f..d62e63ed6f00 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/sheet/XSolver.hpp>
 #include <com/sun/star/sheet/XSolverDescription.hpp>
 
+#include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx
index b488e4ff4efa..b1d98412a183 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/util/XModifyListener.hpp>
+#include <osl/diagnose.h>
 
 #include "listenercalls.hxx"
 
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 1dad56395ffc..47be2d29991a 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -19,6 +19,8 @@
 
 #include "scextopt.hxx"
 
+#include <osl/diagnose.h>
+
 #include <vector>
 #include <map>
 #include <boost/shared_ptr.hpp>