Remove some useless tools/debug.hxx includes

Also remove the tools/solar.h included from tools/debug.hxx. The include of solar.h
header was necessary in some cases because of a macro or a typedef that was needed.

Change-Id: Ia6e15d5c2571c58c9e9138b0d0a7f08ae88053c9
Reviewed-on: https://gerrit.libreoffice.org/11075
Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>

60 files changed, 13 insertions, 74 deletions

diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx
index 78bd6d14ced5..f66f7d370d63 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -29,7 +29,6 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 55dd92cf74fb..839787a2d941 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -19,7 +19,6 @@
 
 #include "dlgedmod.hxx"
 #include "dlgedpage.hxx"
-#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 183b361c4da1..651ef33d95d6 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <basic/sbx.hxx>
 #include "runtime.hxx"
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 6e4f68fbc28a..766f5ef07beb 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 
 #include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index a9b69ec59718..450562802ac1 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -21,6 +21,7 @@
 
 #include <iomanip>
 
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <basic/sbx.hxx>
 #include <svl/SfxBroadcaster.hxx>
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f1efde2295d6..1a5b8e28157a 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -19,6 +19,7 @@
 
 
 #include <math.h>
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 
 #include <basic/sbx.hxx>
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 66c3b5e8180b..6776c0bb7f1c 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <svl/SfxBroadcaster.hxx>
 
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 707191cde43c..638ca0654a94 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 
-#include <tools/debug.hxx>
 #include <comphelper/InlineContainer.hxx>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 2a4b7cdb6501..ac27c223c1ea 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <tools/poly.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 079b9618f529..4745fe3ef85b 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -22,7 +22,6 @@
 
 #include <tools/rtti.hxx>
 #include <tools/ref.hxx>
-#include <tools/debug.hxx>
 
 #include <basic/sbxdef.hxx>
 #include <basic/basicdllapi.h>
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index c14fe88286dd..fcf42073c753 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EDITENG_EDITOBJ_HXX
 
 #include <tools/stream.hxx>
-#include <tools/debug.hxx>
 #include <rsc/rscsfx.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index a3044c1b6809..8b83df542d56 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -26,7 +26,6 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/sfxuno.hxx>
 #include <svl/SfxBroadcaster.hxx>
-#include <tools/debug.hxx>
 #include <tools/rtti.hxx>
 
 class ResMgr;
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 7b7de9ac8d9c..e10ae97e2863 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVL_CENUMITM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/debug.hxx>
 #include <svl/poolitem.hxx>
 
 class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index a88092f50c7f..e2cf48b1dd9e 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -25,7 +25,6 @@
 #include <svl/svldllapi.h>
 #include <svl/poolitem.hxx>
 #include <tools/rtti.hxx>
-#include <tools/debug.hxx>
 #include <map>
 
 class SvStream;
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 9d0599989ee7..9a9351efc116 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVL_VISITEM_HXX
 
 #include <svl/svldllapi.h>
-#include <tools/debug.hxx>
 #include <svl/poolitem.hxx>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 04ab892e0828..e0984d7882f8 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -26,7 +26,6 @@
 
 #include <tools/solar.h>
 #include <tools/link.hxx>
-#include <tools/debug.hxx>
 #include <tools/contnr.hxx>
 
 #include <limits.h>
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index 62c40e0ca769..b80d0f08c9ca 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -23,7 +23,6 @@
 
 #include <sal/detail/log.h>
 #include <sal/types.h>
-#include <tools/solar.h>
 
 /** The facilities provided by this header are deprecated.  True assertions
     (that detect broken program logic) should use standard assert (which aborts
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 06662b9dea4a..25edfd618070 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -35,7 +35,6 @@
 
 #include <rtl/uri.hxx>
 #include <rtl/instance.hxx>
-#include <tools/debug.hxx>
 
 #include <CustomAnimationPreset.hxx>
 #include <TransitionPreset.hxx>
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 75c6245d0f85..e376c5db6758 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/string.hxx>
 
-#include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 3e5ef63030c5..725f89033754 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/debug.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 86a869ef7140..fbe1ed0c13c3 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -20,7 +20,6 @@
 #include "ConfigurationControllerBroadcaster.hxx"
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 3de3f71ee256..d84e68925b88 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 3a7974cfcecd..3eaafa447788 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 #define INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 
-#include <tools/debug.hxx>
 #include <tools/rc.hxx>
 #include <tools/rcid.h>
 #include <tools/resid.hxx>
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index a3bd0e5aaaac..e63ee87f0d3d 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -38,8 +38,6 @@
 #include <cppcanvas/vclfactory.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 
-#include <tools/debug.hxx>
-
 #include <basegfx/range/b1drange.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index eb472265bb4e..ef339d1d5f11 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <svl/cjkoptions.hxx>
 
 #include <svl/languageoptions.hxx>
 #include <i18nlangtag/lang.h>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index a6d75e454328..c11b38966136 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -29,8 +29,6 @@
 #include <svl/languageoptions.hxx>
 #include <unotools/options.hxx>
 
-#include <tools/debug.hxx>
-
 ItemHolder2::ItemHolder2()
     : ItemHolderMutexBase()
 {
diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx
index 3aa493d19a84..581b07c10977 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -19,8 +19,6 @@
 
 #include <assert.h>
 
-#include <tools/debug.hxx>
-
 #include <svl/hint.hxx>
 #include <svl/smplhint.hxx>
 #include <svl/lstner.hxx>
@@ -30,7 +28,6 @@
 
 TYPEINIT0(SfxBroadcaster);
 
-
 // broadcast immediately
 
 void SfxBroadcaster::Broadcast( const SfxHint &rHint )
diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index f905090b81c8..9c2a3921404f 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.cxx
@@ -19,7 +19,6 @@
 
 #include <svl/listener.hxx>
 #include <svl/broadcast.hxx>
-#include <tools/debug.hxx>
 
 SvtListener::QueryBase::QueryBase( sal_uInt16 nId ) : mnId(nId) {}
 SvtListener::QueryBase::~QueryBase() {}
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 993b71233be4..873047b1dc00 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <comphelper/string.hxx>
 #include <tools/date.hxx>
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index e7ec9d434ba3..6a493c261b4b 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -20,8 +20,6 @@
 #include "svx/xmlexchg.hxx"
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
-#include <tools/debug.hxx>
-
 
 namespace svx
 {
@@ -61,6 +59,4 @@ namespace svx
 
 }   // namespace svx
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 7d776cb63b0d..f075d00cf2e9 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -27,7 +27,6 @@
 
 #include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
 using namespace svxform;
@@ -205,9 +204,4 @@ const OSystemParseContext* OParseContextClient::getParseContext() const
     return getSharedContext();
 }
 
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 261d62af88a8..157a7507fba8 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -19,13 +19,8 @@
 
 #include "formdispatchinterceptor.hxx"
 
-#include <tools/debug.hxx>
-
-
 namespace svxform
 {
-
-
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::uno::UNO_QUERY;
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 3ef8f1579caa..ca4a14e57d7b 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -20,7 +20,6 @@
 
 #include <tools/stream.hxx>
 #include <tools/zcodec.hxx>
-#include <tools/debug.hxx>
 #include "codec.hxx"
 #include <boost/scoped_array.hpp>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 7542637880ff..56b97927233b 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -36,7 +36,6 @@
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/saveopt.hxx>
-#include <tools/debug.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/metaact.hxx>
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index b006b15557f7..ca65735eb814 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -21,8 +21,6 @@
 #include "toolkit/helper/property.hxx"
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 
-
-#include <tools/debug.hxx>
 #include <vcl/spin.hxx>
 #include <vcl/svapp.hxx>
 #include "vclxwindows_internal.hxx"
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 2123598fe2a4..30b28c58d8f4 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -36,7 +36,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 87145e07c81c..3c30a250228a 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -22,6 +22,7 @@
 #include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
@@ -35,8 +36,6 @@ using namespace osl;
 using namespace utl;
 using namespace com::sun::star::uno;
 
-// define ----------------------------------------------------------------
-
 #define DEFAULTPATH__ADDIN          0
 #define DEFAULTPATH__AUTOCORRECT    1
 #define DEFAULTPATH__AUTOTEXT       2
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 6c2c473da3ec..94667443c0df 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -21,6 +21,7 @@
 
 #include <unotools/fltrcfg.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index f24a0eb8451a..74666473b99b 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -22,6 +22,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 9d5202c87098..5f0b5c6be1a9 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -22,6 +22,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 75c34ef1bee2..5f7c0c4a8241 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -29,8 +29,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basebmp/scanlineformats.hxx>
 
-#include <tools/debug.hxx>
-
 #if OSL_DEBUG_LEVEL > 2
 #include <basebmp/debug.hxx>
 #include <fstream>
diff --git a/vcl/inc/quartz/common.h b/vcl/inc/quartz/common.h
index 2d9b717b5dc6..8e3f28669628 100644
--- a/vcl/inc/quartz/common.h
+++ b/vcl/inc/quartz/common.h
@@ -33,8 +33,6 @@
 
 #include <sal/types.h>
 
-#include <tools/debug.hxx>
-
 // CoreFoundation designers, in their wisdom, decided that CFRelease of NULL
 // cause a Crash, yet few API can return NULL when asking for the creation
 // of an object, which force us to peper the code with egly if construct everywhere
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index c88aac727027..df97776b836c 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -26,7 +26,6 @@
 #include "SchXMLSeries2Context.hxx"
 #include "SchXMLTools.hxx"
 #include <unotools/mediadescriptor.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 14ce0ec9e227..4f85439ad846 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -31,7 +31,6 @@
 #include "SchXMLEnumConverter.hxx"
 #include "facreg.hxx"
 
-#include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/globname.hxx>
 #include <comphelper/classids.hxx>
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index b8b13f3768c9..68049c2d3f6c 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -24,7 +24,6 @@
 #include "SchXMLTools.hxx"
 #include "facreg.hxx"
 
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 93bcbb37d16b..e643771b1d31 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -25,7 +25,6 @@
 #include "SchXMLAxisContext.hxx"
 #include "SchXMLSeries2Context.hxx"
 #include "SchXMLTools.hxx"
-#include <tools/debug.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <xmloff/xmlnmspe.hxx>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 9f69e4d17187..c86ea58a24bc 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -42,7 +42,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 3535fcbde31e..3666e01d7464 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <rtl/ustring.h>
-#include <tools/debug.hxx>
 
 #include <typeinfo>
 
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 43804bea4001..e5b266689c36 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <xmloff/ProgressBarHelper.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/xmltoken.hxx>
 
 #include <stdlib.h>
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 16f2e53c4334..5bd746d38d70 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <xmloff/xmlerror.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
@@ -26,11 +25,8 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-
 #include <rtl/ustrbuf.hxx>
 
-
-
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3f7d0e83634c..1122dfc7ebd9 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -25,7 +25,6 @@
 #include <officecfg/Office/Common.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 14f8ae9c9970..6b7f257adfe6 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -26,8 +26,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlictxt.hxx>
-#include <tools/debug.hxx>
-
 
 using namespace ::com::sun::star;
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 5d15bea2fa8b..804e540bcc5a 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -21,7 +21,6 @@
 
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/mutex.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index bc7565bb2d6a..6110b258ba2a 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -39,7 +39,6 @@
 #include "sdpropls.hxx"
 #include <xmloff/xmlexppr.hxx>
 #include <xmloff/xmlerror.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/settingsstore.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 6882cf6ce4ef..f3968e3c37a2 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "xexptran.hxx"
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 1bd1f19bf2a0..e41d31ef549c 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <tools/debug.hxx>
 #include <unotools/streamwrap.hxx>
 #include <xmlversion.hxx>
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 526485097a28..1888407d2e10 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -21,6 +21,7 @@
 
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <xmloff/PageMasterStyleMap.hxx>
 #include <xmloff/attrlist.hxx>
 #include <xmloff/families.hxx>
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index d0bd57045489..981524ee28ea 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -21,11 +21,9 @@
 #include <com/sun/star/uno/Reference.h>
 
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include "XMLPropertyBackpatcher.hxx"
 #include <xmloff/txtimp.hxx>
 
-
 using ::std::vector;
 using ::std::map;
 using ::com::sun::star::uno::Reference;
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 6123054c3ff6..2ffe6887b8b5 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <tools/debug.hxx>
+#include <tools/solar.h>
 #include <o3tl/sorted_vector.hxx>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 2cb66dc444d8..a7b94e46a7dc 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -20,7 +20,6 @@
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/debug.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include <com/sun/star/text/XTextFrame.hpp>