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

15 files changed, 17 insertions, 9 deletions

diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx
index 7a0ddb506b89..33287cee05dd 100644
--- a/include/basegfx/color/bcolormodifier.hxx
+++ b/include/basegfx/color/bcolormodifier.hxx
@@ -22,6 +22,9 @@
 
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
+
+#include <osl/diagnose.h>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <vector>
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 162ef84a543b..92e7c03f4144 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -22,6 +22,9 @@
 
 #include <sal/types.h>
 #include <vector>
+
+#include <osl/diagnose.h>
+
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 980ec6270ecc..389bd8865aca 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -29,6 +29,7 @@
 #include <set>
 #include <boost/shared_ptr.hpp>
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 
 // forward declarations
 namespace com
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 4b52c55e0682..2813af03c943 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -23,6 +23,8 @@
 
 #include <functional>
 #include <vector>
+
+#include <osl/diagnose.h>
 #include <osl/mutex.hxx>
 #include <rtl/alloc.h>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 07773b826048..293f18d25aa6 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -30,6 +30,7 @@
 #include <rtl/ustring.hxx>
 
 #include <osl/file.h>
+#include <osl/diagnose.h>
 #include <rtl/byteseq.hxx>
 
 #include <stdio.h>
diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx
index e5331efc5291..0c095a2055d9 100644
--- a/include/osl/thread.hxx
+++ b/include/osl/thread.hxx
@@ -25,9 +25,6 @@
 #include <cassert>
 
 #include <osl/time.h>
-
-
-#include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <rtl/alloc.h>
 
diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx
index c54aa64018ae..c49e37125998 100644
--- a/include/rtl/byteseq.hxx
+++ b/include/rtl/byteseq.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_RTL_BYTESEQ_HXX
 #define INCLUDED_RTL_BYTESEQ_HXX
 
-#include <osl/interlck.h>
 #include <rtl/byteseq.h>
-#include <rtl/alloc.h>
 
 #include <new>
 
diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx
index f8b75a75c50f..25f51732fcd0 100644
--- a/include/rtl/instance.hxx
+++ b/include/rtl/instance.hxx
@@ -23,7 +23,9 @@
 #include <sal/config.h>
 
 #include <osl/doublecheckedlocking.h>
+#if ! HAVE_THREADSAFE_STATICS
 #include <osl/getglobalmutex.hxx>
+#endif
 
 namespace {
 
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 77de66ab7348..942923ad6819 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -25,7 +25,6 @@
 #include <cassert>
 
 #include <sal/types.h>
-#include <osl/interlck.h>
 
 namespace rtl
 {
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 21cca1083914..0f65c430433a 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -27,7 +27,6 @@
 #include <ostream>
 #include <string.h>
 
-#include <osl/diagnose.h>
 #include <rtl/textenc.h>
 #include <rtl/string.h>
 #include <rtl/stringutils.hxx>
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 8ed738158b3d..64c26cff3424 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -25,7 +25,6 @@
 #include <cassert>
 #include <string.h>
 
-#include <osl/diagnose.h>
 #include <rtl/ustrbuf.h>
 #include <rtl/ustring.hxx>
 #include <rtl/stringutils.hxx>
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 66b320f09636..72048b31eee3 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -27,7 +27,6 @@
 #include <ostream>
 #include <string.h>
 
-#include <osl/diagnose.h>
 #include <rtl/ustring.h>
 #include <rtl/string.hxx>
 #include <rtl/stringutils.hxx>
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 6b8b2c3f1673..d078ad1ae4fe 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -23,6 +23,8 @@
 #include <svl/svldllapi.h>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
+#include <osl/diagnose.h>
+
 #include <vector>
 
 #define SFX_REC_PRETAG_EXT              sal_uInt8(0x00) // Pre-Tag for Extended-Records
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 2291bc2eef89..2ad5ae1708d7 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -22,6 +22,7 @@
 #include <cppu/macros.hxx>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
+#include <osl/diagnose.h>
 #include <uno/mapping.h>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index ff8bd91adf6b..f30cdcd062b0 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -24,6 +24,8 @@
 
 #include <tools/resid.hxx>
 
+#include <osl/getglobalmutex.hxx>
+
 #include <memory>
 
 class ResMgr;