Removed unnecessary tools/debug.hxx includes.

243 files changed, 6 insertions, 276 deletions

diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index c4b836e2b2c3..75ac84d47605 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/awt/InvalidateStyle.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
 
 //____________________________________________________________________________________________________________
 //  includes of my project
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index ccf0dc923e8c..f3a55144ab1d 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -31,7 +31,6 @@
 #define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX
 
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 6c406b4fa0b5..3a50d699a5e5 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -31,7 +31,6 @@
 #define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLBASE_HXX
 
 #include <svtools/accessibletable.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 2d7dcd9b4194..b8d5430d1cec 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index f4a542085792..24765a7891db 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 3caea5db7b06..3bc0355014eb 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index d7aa0829e28e..18909e38c914 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -32,7 +32,6 @@
 #include <gst/gst.h>
 
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index c2a9c7b022cf..ede023ed0ab5 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -40,7 +40,6 @@
 #ifndef __RTL_USTRING_
 #include <rtl/ustring.hxx>
 #endif
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index 66d9164e235a..37a89b389e15 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -31,7 +31,6 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 84e31162559f..cc9e6f6c740c 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -42,7 +42,6 @@
 #include "NumberFormatterWrapper.hxx"
 #include "RegressionCurveHelper.hxx"
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <tools/string.hxx>
 
 #include <com/sun/star/chart2/XTitle.hpp>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 8952f2f9ec3b..dbe13b7e3248 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -42,7 +42,6 @@
 
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
-#include <tools/debug.hxx>
 
 //for auto_ptr
 #include <memory>
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 787e0bac7681..10f206404586 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XLegend.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 71c8d6a922aa..86e2fcc33796 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -38,8 +38,6 @@
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 6a85a3463380..fffe6549e227 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -33,8 +33,6 @@
 // header for define DELETEZ
 #include <tools/solar.h>
 
-#include <tools/debug.hxx>
-
 //.............................................................................
 namespace chart
 {
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 896caf976eee..92339139b465 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/chart/TimeUnit.hpp>
 
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <limits>
 
 //.............................................................................
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 2c822aac3ca7..fa20c2e1053a 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -44,7 +44,6 @@
 
 #include <rtl/math.hxx>
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <editeng/unoprnms.hxx>
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 29cfc959053c..a8294a31c4f7 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/chart2/Symbol.hpp>
 
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 61d5d8dc795c..f3e5313551ec 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/debug.hxx>
 #include "NDebug.hxx"
 #include <comphelper/sequence.hxx>
 
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index c8bcc0b71af6..93009a071e41 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/content.hxx>
-#include <tools/debug.hxx>
 #include "NDebug.hxx"
 #include <signal.h>
 #include "resource/common_res.hrc"
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 21b3836807e2..7a482d0bdd63 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -32,7 +32,6 @@
 
 #define _CUI_CHARMAP_CXX_
 #include <tools/shl.hxx>
-#include <tools/debug.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 89ea202ebb5c..ae0beaa3623d 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <tools/shl.hxx>
-#include <tools/debug.hxx>
 #include <vcl/msgbox.hxx>
 
 #include <cuires.hrc>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 2a02a180314b..1f052682c75d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 // include ---------------------------------------------------------------
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 1634739b0c2e..8d9d9d2a57e2 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -35,7 +35,6 @@
 #include "dialmgr.hxx"
 
 #include <sfx2/tabdlg.hxx>
-#include <tools/debug.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index bc4c4804a4c3..3987544b7ce7 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
-#include <tools/debug.hxx>
 #include <vcl/stdtext.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index b34736623e74..529bc1a247e5 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <cuires.hrc>
-#include <tools/debug.hxx>
 #include <svl/filenotation.hxx>
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 7874eaaeb8f3..2ca6d3986623 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -33,7 +33,6 @@
 #include <svx/anchorid.hxx>
 #include <svl/aeitem.hxx>
 #include <svx/swframevalidation.hxx>
-#include <tools/debug.hxx>
 #include <cuires.hrc>
 #include <swpossizetabpage.hrc>
 #include <svx/htmlmode.hxx>
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index 1b38fdde5181..dd5dabb79bd6 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -33,7 +33,6 @@
 #include "dbastrings.hrc"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
-#include <tools/debug.hxx>
 
 
 using namespace connectivity;
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 61ec7e227d97..1f8d58b14a57 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
-#include <tools/debug.hxx>
 #include "dbastrings.hrc"
 #include <rtl/logfile.hxx>
 
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 6de527e80166..6268bc6a0341 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -54,7 +54,6 @@
 #include <rtl/uri.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
-#include <tools/debug.hxx>
 #include <ucbhelper/configurationkeys.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 416dadedb501..f2e52647eabb 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -30,7 +30,6 @@
 
 #include <tools/gen.hxx>
 #include <tools/string.hxx>
-#include <tools/debug.hxx>
 
 #include <svl/brdcst.hxx>
 
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 257edea4e679..de126be6f815 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -31,7 +31,6 @@
 
 #include <limits.h>
 #include <tools/shl.hxx>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <editeng/editrids.hrc>
 #include <editeng/paperinf.hxx>
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 605728da5cc5..b90bf75b35c6 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -31,7 +31,6 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include <tools/debug.hxx>
 #include <svtools/langtab.hxx>
 
 #ifndef __RSC
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index c1d928ebaca0..a946adb3efca 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -33,6 +33,7 @@
 #include <editeng/numdef.hxx>
 
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 DBG_NAME(Paragraph)
 
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 306db63440c5..57d50f034477 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
-
 #include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index c2763b37a89e..514e600b66d9 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <tools/debug.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/brdcst.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index e73f8e87654a..91d3224f174b 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 61ad7c188e10..3a5229e291df 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -29,7 +29,6 @@
 #include "abpfinalpage.hxx"
 #include "addresssettings.hxx"
 #include "abspilot.hxx"
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index aed0fbaabc0d..2042c7ee3168 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -29,7 +29,6 @@
 
 #include <bibconfig.hxx>
 #include <svl/svarray.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 03719c664b4d..cb55ff659e10 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
-#include <tools/debug.hxx>
 
 #include "bibmod.hxx"
 #include "bibresid.hxx"
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 4b1e32c23c07..b1607395b4d9 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <datman.hxx>
-#include <tools/debug.hxx>
 #include <svx/svxids.hrc>
 #include <svtools/miscopt.hxx>
 #include <svtools/imgdef.hxx>
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 1d1a1fca0a1b..c0415efafa48 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include "optiongrouplayouter.hxx"
-#include <tools/debug.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 98912a603a8b..b87b83f6588b 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/presentation/XPresentation.hpp>
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
-#include <tools/debug.hxx>
 #include <vcl/window.hxx>
 #include <rtl/textenc.h>
 #include <rtl/locale.h>
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 49d4349cf241..4e81a8f1955c 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -39,7 +39,6 @@
 
 #include <osl/diagnose.h>
 #include <salhelper/simplereferenceobject.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/MethodConcept.hpp>
 #include <com/sun/star/beans/PropertyConcept.hpp>
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 869e5414763d..0d9f5f92111a 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -42,7 +42,6 @@
 #include <cstdarg>
 
 #include <plugin/impl.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/container/XSet.hpp>
diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx
index d38cc7c01ed2..aa9012ad4a13 100644
--- a/extensions/source/plugin/inc/plugin/plctrl.hxx
+++ b/extensions/source/plugin/inc/plugin/plctrl.hxx
@@ -28,8 +28,6 @@
 #ifndef __PLCTRL_HXX
 #define __PLCTRL_HXX
 
-#include <tools/debug.hxx>
-
 #include <cppuhelper/weak.hxx>
 #include <plugin/multiplx.hxx>
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index 2afc4ebfe7fe..da634b2bdce2 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -31,7 +31,6 @@
 
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 7fa196afda12..7fd3cf095db1 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -29,7 +29,6 @@
 #define _MSOCXIMEX_HXX
 
 #include <sot/storage.hxx>
-#include <tools/debug.hxx>
 
 #include "filter/msfilter/msfilterdllapi.h"
 
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 9aa4e941b28c..1d23229af1de 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -47,7 +47,6 @@
 
 #include <osl/diagnose.h>
 #include <rtl/process.h>
-#include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 0a2ee253f3f3..21c123853503 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -71,7 +71,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index d06c8b34d716..75a50b85936b 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -32,7 +32,6 @@
 #include <stack>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <vcl/salbtype.hxx>
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 218434840900..1cb2cb41a2d1 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/debug.hxx>
 
 #include "typedetectionimport.hxx"
 #include "xmlfiltersettingsdialog.hxx"
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 8bff01d78978..96cebbfd7dfd 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -29,7 +29,6 @@
 #include "formcontrolfont.hxx"
 #include "property.hrc"
 #include "property.hxx"
-#include <tools/debug.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
 #include <tools/color.hxx>
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index c23479a84f78..809bf178f1ab 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -29,10 +29,6 @@
 #include "controlfeatureinterception.hxx"
 #include "urltransformer.hxx"
 
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-#include <tools/debug.hxx>
-
 //........................................................................
 namespace frm
 {
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index f1eedf6c352e..b80f5ea295d9 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -31,7 +31,6 @@
 
 #include "property.hrc"
 #include <cppuhelper/queryinterface.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <algorithm>
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index a5802d0f9b81..b5e775123edd 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -32,7 +32,6 @@
 #include "convert.hxx"
 
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
-#include <tools/debug.hxx>
 #include <tools/datetime.hxx>
 #include <rtl/math.hxx>
 
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index 8d6dc0843e6b..c0523629d175 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <tools/debug.hxx>
+#include <tools/solar.h>
 
 #include <vector>
 
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
index 4f67a8293e5a..2eb29a3f7e6a 100644
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
@@ -30,8 +30,6 @@
 
 #include "ODMAFilePicker.hxx"
 
-#include <tools/debug.hxx>
-
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 0a60a9b84d0a..d1e488f7928c 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -34,7 +34,6 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx
index f71c79991a6e..b4e065bc0e43 100644
--- a/framework/source/fwe/xml/statusbarconfiguration.cxx
+++ b/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -46,7 +46,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <tools/debug.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespace
diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 9b0c0ed67da2..3cd9b2bec9aa 100644
--- a/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -46,7 +46,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <tools/debug.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespace
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 83988095751c..51ec80fd4c49 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -56,7 +56,6 @@
 #include <i18npool/mslangid.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/debug.hxx>
 #include <tools/wldcrd.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index d22e36f691d4..a76237b629db 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -51,7 +51,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <cppuhelper/weak.hxx>
-#include <tools/debug.hxx>
 
 //_________________________________________________________________________________________________________________
 //  Defines
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index 738d6f2930eb..ba7aa9450334 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -47,7 +47,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <tools/debug.hxx>
 
 //_________________________________________________________________________________________________________________
 //  namespace
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index e084a4434a9d..777ba787ac11 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include <limits.h>
 #include <ctype.h>
 #include <bastype.hxx>
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 2e3dba877dec..30d936041099 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -32,8 +32,6 @@
 
 #include <rtl/strbuf.hxx>
 
-#include <tools/debug.hxx>
-
 #include <object.hxx>
 #include <globals.hxx>
 #include <database.hxx>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 3e0d068d4352..526ffcdf543e 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <com/sun/star/uno/Reference.h>
-#include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 
 #include "nthesdta.hxx"
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index f5f4c74360d8..340403a91055 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -35,7 +35,6 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <svl/svarray.hxx>
-#include <tools/debug.hxx>
 
 #include "linguistic/misc.hxx"
 #include "lngopt.hxx"
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index ca8df5a3b2c4..4eb9a1a0f559 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -37,7 +37,6 @@
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 #include <cppuhelper/implbase3.hxx> // helper for implementations
 #include <cppuhelper/interfacecontainer.h>
-#include <tools/debug.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index e73fa1e8712c..f5488eb2937e 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -28,7 +28,6 @@
 
 #include <unicode/uscript.h>
 #include <i18npool/lang.h>
-#include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index 17b2f8a7f31a..134b0d8d14ec 100644
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.cxx
@@ -32,7 +32,6 @@
 
 #include "sprophelp.hxx"
 #include "linguistic/lngprops.hxx"
-#include <tools/debug.hxx>
 
 #include <com/sun/star/linguistic2/LinguServiceEvent.hpp>
 #include <com/sun/star/linguistic2/LinguServiceEventFlags.hpp>
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 6854cec6e635..38b80c859b12 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -31,7 +31,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontWidth.hpp>
 #include "ReportControlModel.hxx"
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 23236b0950cc..057d7dcf0616 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -28,7 +28,6 @@
 #include "metadata.hxx"
 #include <svtools/localresaccess.hxx>
 #include "com/sun/star/inspection/XPropertyHandler.hpp"
-#include <tools/debug.hxx>
 #include <comphelper/extract.hxx>
 #include "helpids.hrc"
 #include "RptResId.hrc"
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index adabb2600a2a..641817d01a87 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -28,7 +28,6 @@
 
 
 #include "FunctionHelper.hxx"
-#include <tools/debug.hxx>
 
 // =============================================================================
 namespace rptui
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 761158d80f88..c3eb51ca9541 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -32,7 +32,6 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/solar.h>
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/endian.h>
 
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 200672a733df..9d99b6988809 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -34,7 +34,6 @@
 #include <list>
 #include <vector>
 #include <tools/gen.hxx>
-#include <tools/debug.hxx>
 #include <global.hxx>
 
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx
index a0bef3a1004f..e1f92d9faa2c 100644
--- a/sd/inc/misc/scopelock.hxx
+++ b/sd/inc/misc/scopelock.hxx
@@ -29,6 +29,8 @@
 #ifndef _SD_SCOPELOCK_HXX
 #define _SD_SCOPELOCK_HXX
 
+#include <sal/types.h>
+
 namespace sd
 {
 
diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx
index 58c892bb31d9..60d43bc5d101 100644
--- a/sd/source/core/shapelist.cxx
+++ b/sd/source/core/shapelist.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <svx/svdobj.hxx>
 #include "shapelist.hxx"
 
diff --git a/sd/source/core/undo/undofactory.cxx b/sd/source/core/undo/undofactory.cxx
index 4bb42b13e2b5..5e02f5a86734 100644
--- a/sd/source/core/undo/undofactory.cxx
+++ b/sd/source/core/undo/undofactory.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
-
 #include "undo/undofactory.hxx"
 #include "undo/undoobjects.hxx"
 
diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx
index 4200155be59f..faeaa8caff0b 100644
--- a/sd/source/core/undo/undomanager.cxx
+++ b/sd/source/core/undo/undomanager.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include "undo/undomanager.hxx"
 
 using namespace sd;
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index c9fea95e828a..64a7a03b6359 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -54,7 +54,6 @@ using namespace com::sun::star::ui::dialogs;
 
 #include "pres.hxx"
 #include "sdabstdlg.hxx"
-#include "tools/debug.hxx"
 class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
 <
     XExporter,
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index 3cb5c0d40695..359eaff730f2 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -34,7 +34,6 @@
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/oslfile2streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/debug.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/image.hxx>
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index ee9d816d5e27..8ca34ebfb626 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <propread.hxx>
-#include "tools/debug.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textenc.h"
 
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index c63b3ec04f47..00169331c133 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -30,7 +30,6 @@
 
 #include <memory>
 
-#include <tools/debug.hxx>
 #include <osl/module.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx
index fd7493e26584..e1db211564c2 100644
--- a/sd/source/ui/animations/STLPropertySet.cxx
+++ b/sd/source/ui/animations/STLPropertySet.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include "STLPropertySet.hxx"
 
 using namespace com::sun::star::beans;
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index 9202c18d942f..ddc658f7e25d 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include "strings.hrc"
 #include "dlgctrls.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 18edbb2c1f4f..36150899f2df 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -47,7 +47,6 @@
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
-#include <tools/debug.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 
diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx
index 4f05f610c5e3..9d1f620bb47e 100644
--- a/sd/source/ui/func/sdundo.cxx
+++ b/sd/source/ui/func/sdundo.cxx
@@ -29,7 +29,6 @@
 
 
 #include "sdundo.hxx"
-#include <tools/debug.hxx>
 
 TYPEINIT1(SdUndoAction, SfxUndoAction);
 
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 7114739242cb..1ff570f8370d 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -30,7 +30,6 @@
 #define _SD_TYPEDETECT_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index eb9b3b199efc..80aad8a6eff4 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
 #include <cppuhelper/compbase2.hxx>
 #include <boost/bind.hpp>
-#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 82e3fcd5075a..fd12a38ae6da 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -47,7 +47,6 @@
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <boost/bind.hpp>
-#include <tools/debug.hxx>
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index bee8d332c536..ab6823f9043d 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -47,7 +47,6 @@
 /** === end UNO includes === **/
 
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 4cc0ce974514..eac6f02a4fd0 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <tools/debug.hxx>
 #include <vcl/timer.hxx>
 #include <svl/svarray.hxx>
 
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 26fb1b303502..0931a0c7acff 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/plugin/PluginMode.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2bfa0661f4bf..8f24951486e4 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -28,7 +28,6 @@
 
 
 #define _SOT_FORMATS_INCLUDE_SYSTEMFORMATS
-#include <tools/debug.hxx>
 #include <tools/solar.h>
 
 #include <sot/exchange.hxx>
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index dffcd757bbeb..73b24b7a8b37 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -29,7 +29,6 @@
 
 #define _SOT_OBJECT_CXX
 
-#include <tools/debug.hxx>
 #include <sot/object.hxx>
 #include <sot/factory.hxx>
 
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 127cd6027a60..68a7a3a00c6f 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -32,7 +32,6 @@
 #include "stgole.hxx"
 #include "sot/storinfo.hxx"     // Read/WriteClipboardFormat()
 
-#include <tools/debug.hxx>
 #if defined(_MSC_VER) && (_MSC_VER>=1400)
 #pragma warning(disable: 4342)
 #endif
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 5e6c1eadf084..24c442212a76 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -31,7 +31,6 @@
 
 #include <osl/file.hxx>
 #include <tools/tempfile.hxx>
-#include <tools/debug.hxx>
 
 #include "sot/stg.hxx"
 #include "stgelem.hxx"
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index e2de352ac8da..00ca51a10dbf 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -57,7 +57,6 @@
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-#include <tools/debug.hxx>
 #include <tools/inetmime.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index 49f71354d80a..ac58097c76a3 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include <svl/listener.hxx>
 #include <svl/listeneriter.hxx>
 #include <svl/broadcast.hxx>
diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index 9170156107e7..1494ff305df3 100644
--- a/svl/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include "listenerbase.hxx"
 #include <svl/listeneriter.hxx>
 #include <svl/listener.hxx>
diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index be5c3192d830..846189d4b854 100644
--- a/svl/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
-
 #include "listenerbase.hxx"
 #include <svl/listeneriter.hxx>
 #include <svl/broadcast.hxx>
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 2006a856ae4b..99ec1829cc9d 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -28,7 +28,6 @@
 
 
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 #include <i18npool/mslangid.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 1fdc30b4601c..32be1a893e26 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -39,6 +39,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/sharedmutex.hxx>
 #include <rtl/ref.hxx>
+#include <tools/solar.h>
 
 class SvNumberformat;
 class SvNumberFormatter;
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 5871ec025dcf..0433659daf4a 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -29,7 +29,6 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <tools/debug.hxx>
 #include <comphelper/servicehelper.hxx>
 
 #include <svl/numuno.hxx>
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 5b09f66cef9a..f643f52495a4 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -31,7 +31,6 @@
 #include "configitems/accessibilityoptions_const.hxx"
 
 #include <unotools/configmgr.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 50227d26f571..54f93b04b8bb 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configpathes.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index e37a366ef046..8e20a8dac6ae 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configpathes.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index fc553edd5113..56bc0181055e 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -34,7 +34,6 @@
 #include <svtools/printoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 #include <vcl/print.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index cf7df7966e6a..e45b37d7ff11 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -28,7 +28,6 @@
 
 
 #define _CTRLBOX_CXX
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/field.hxx>
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 7b001ea53141..197cb70c0c67 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -35,7 +35,6 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.h>
 #include <vcl/stdtext.hxx>
-#include <tools/debug.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx
index aab7f71d02b7..c5c4dad776d2 100644
--- a/svtools/source/control/svxbox.cxx
+++ b/svtools/source/control/svxbox.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/svxbox.hxx>
 #include <unotools/charclass.hxx>
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index 06de3c1b6b04..9ee135b7650f 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.cxx
@@ -29,7 +29,6 @@
 
 #define _TASKBAR_CXX
 
-#include <tools/debug.hxx>
 #include <vcl/floatwin.hxx>
 
 #include <svtools/taskbar.hxx>
diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index 4dc0d5526aae..0735de900249 100644
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.cxx
@@ -29,7 +29,6 @@
 
 #define _TASKBAR_CXX
 
-#include <tools/debug.hxx>
 #include <vcl/help.hxx>
 #include <svtools/taskbar.hxx>
 
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index a074cf3c02bf..d1959a52caca 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -29,7 +29,6 @@
 
 #define _TASKBAR_CXX
 
-#include <tools/debug.hxx>
 #include <tools/date.hxx>
 #include <vcl/image.hxx>
 #include <vcl/help.hxx>
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index 300cd198c9f4..b30af4000fcf 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -29,7 +29,6 @@
 #ifndef FILEDLG2_HXX
 #define FILEDLG2_HXX
 
-#include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <vcl/button.hxx>
 #include <vcl/unohelp.hxx>
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 7699d1852113..66e7c73e9b19 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -28,7 +28,6 @@
 
 
 #define _SVT_WIZDLG_CXX
-#include <tools/debug.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index b9869fbc5195..0e5beffa5141 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -31,7 +31,6 @@
 
 #include <unotools/charclass.hxx>
 #include <comphelper/string.hxx>
-#include <tools/debug.hxx>
 
 // ##########################################################################
 // ATTENTION: all these words needs to be in small caps
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 41a134da4899..f3538908342a 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -33,7 +33,6 @@
 #include <svtools/textdata.hxx>
 #include <svtools/txtattr.hxx>
 
-#include <tools/debug.hxx>
 #include <tools/string.hxx>
 
 typedef TextCharAttrib* TextCharAttribPtr;
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index a4e3498ba395..da71bb531dcc 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -28,7 +28,6 @@
 
 #include "FilterConfigCache.hxx"
 #include <svtools/filter.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>
diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index d97bfc059e1e..4d79d96c1626 100644
--- a/svtools/source/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
@@ -28,7 +28,6 @@
 
 #include <svtools/FilterConfigItem.hxx>
 
-#include <tools/debug.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/svtools/source/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index ccf403ef5422..d229dcb62a6d 100644
--- a/svtools/source/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <tools/stream.hxx>
-#include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 #include <svtools/filter.hxx>
 #include "FilterConfigCache.hxx"
diff --git a/svtools/source/filter/wmf/emfwr.hxx b/svtools/source/filter/wmf/emfwr.hxx
index ee3b723ace3e..bed4b7d57807 100644
--- a/svtools/source/filter/wmf/emfwr.hxx
+++ b/svtools/source/filter/wmf/emfwr.hxx
@@ -29,7 +29,6 @@
 #ifndef _EMFWR_HXX
 #define _EMFWR_HXX
 
-#include <tools/debug.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svtools/source/filter/wmf/wmfwr.hxx b/svtools/source/filter/wmf/wmfwr.hxx
index d33b03cce37f..499918dcc7b1 100644
--- a/svtools/source/filter/wmf/wmfwr.hxx
+++ b/svtools/source/filter/wmf/wmfwr.hxx
@@ -29,7 +29,6 @@
 #ifndef _WMFWR_HXX
 #define _WMFWR_HXX
 
-#include <tools/debug.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 51e93d485065..df6c0cbd26d6 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -28,7 +28,6 @@
 
 
 #include <tools/shl.hxx>
-#include <tools/debug.hxx>
 
 #include <com/sun/star/i18n/DirectionProperty.hpp>
 
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 7fd0569ba96d..596fb9de44e6 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 2f0edafa0b17..235bfc367800 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -35,8 +35,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
 
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 052bca26ab09..692ddb4df8a8 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -32,7 +32,6 @@
 #include "tabledatawindow.hxx"
 #include "mousefunction.hxx"
 
-#include <tools/debug.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
 
diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx
index 7fa806e6a9e0..145a4fdefd93 100644
--- a/svtools/source/table/tablegeometry.cxx
+++ b/svtools/source/table/tablegeometry.cxx
@@ -29,8 +29,6 @@
 #include "tablegeometry.hxx"
 #include "tablecontrol_impl.hxx"
 
-#include <tools/debug.hxx>
-
 //......................................................................................................................
 namespace svt { namespace table
 {
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 4ab0cbfd5d8d..d2e5c55d6086 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -28,7 +28,6 @@
 
 
 #define _SVTREEBX_CXX
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 8ed7996c16d0..0a12985865c0 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <sot/formats.hxx>
 #include <tools/stream.hxx>
 
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 4ae2bc89847e..3168a2f22337 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -35,7 +35,6 @@
 #include <vcl/scrbar.hxx>
 #include <map>
 #include <tools/shl.hxx>
-#include <tools/debug.hxx>
 #include "svx/svxdllapi.h"
 
 // define ----------------------------------------------------------------
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index 49fec4091d54..7b88fabf0097 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -32,7 +32,6 @@
 #include <sal/types.h>
 
 #include <vector>
-#include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx
index d1a2633877d3..7464c1bfb101 100644
--- a/svx/inc/svx/sdrpagewindow.hxx
+++ b/svx/inc/svx/sdrpagewindow.hxx
@@ -29,7 +29,6 @@
 #ifndef _SDRPAGEWINDOW_HXX
 #define _SDRPAGEWINDOW_HXX
 
-#include <tools/debug.hxx>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 5cf45996ea5a..208106e56e96 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -37,7 +37,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <tools/gen.hxx>
 #include <svl/smplhint.hxx>
 #include <toolkit/helper/convert.hxx>
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index f489970256d9..60bba793a264 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -34,7 +34,6 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/svdobj.hxx>
-#include <tools/debug.hxx>
 
 #include <sfx2/objsh.hxx>
 
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index b9f42caea07e..a3598f7e8b58 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -63,7 +63,6 @@
 #include "svx/fmtools.hxx"
 #include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <cppuhelper/component.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/container.hxx>
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 5e6530f26fca..b716eea9f462 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -84,7 +84,6 @@
 #include <comphelper/stl_types.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <tools/debug.hxx>
 #include <vcl/timer.hxx>
 
 #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22)
diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 42b9e9c88b5b..25405ba289f3 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <svx/sdr/animation/animationstate.hxx>
-#include <tools/debug.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/animation/objectanimator.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx
index af168963b8b2..5f0f4c935421 100644
--- a/svx/source/sdr/animation/objectanimator.cxx
+++ b/svx/source/sdr/animation/objectanimator.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <svx/sdr/animation/objectanimator.hxx>
-#include <tools/debug.hxx>
 #include <svx/sdr/animation/animationstate.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index 499c6aaf7f6c..3f1f98650a39 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -35,6 +35,7 @@
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/contact/objectcontactofpageview.hxx>
+#include <tools/debug.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index e27a7693c1d6..cd1d709a4f6b 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -28,7 +28,6 @@
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <tools/debug.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <vcl/outdev.hxx>
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index a4f5a0b45d5f..ea94f3c36424 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -28,7 +28,6 @@
 
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
-#include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx
index ea4415fe90b0..971c13e93cd0 100644
--- a/svx/source/svdraw/selectioncontroller.cxx
+++ b/svx/source/svdraw/selectioncontroller.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <svx/selectioncontroller.hxx>
 
 namespace sdr
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 24661655c9ad..b13497d66bda 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -33,7 +33,6 @@
 
 #include <comphelper/accessiblewrapper.hxx>
 #include <osl/mutex.hxx>
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 
 #include <svx/AccessibleTableShape.hxx>
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 339b09c5fe83..fb83a4c5df5a 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 50106c15fcbe..45ff09c7d335 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index a1553718328d..9c633857832b 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
-#include <tools/debug.hxx>
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "rtl/ref.hxx"
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 2c8a8b6a8af8..fdf6a4f2ff1f 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -55,8 +55,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 
-#include <tools/debug.hxx>
-
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Type;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index af17e2316f51..9f6dd3eb21e5 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -35,7 +35,6 @@
 #include <comphelper/sequence.hxx>
 #include <toolkit/controls/eventcontainer.hxx>
 #include <toolkit/helper/property.hxx>
-#include <tools/debug.hxx>
 #include <algorithm>
 #include <functional>
 #include <comphelper/sequence.hxx>
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 8439fd2bf676..91fcda50e0e9 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -30,7 +30,6 @@
 #include "toolkit/helper/property.hxx"
 #include "toolkit/helper/unopropertyarrayhelper.hxx"
 #include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
 
 // for introspection
 #include <toolkit/awt/vclxwindows.hxx>
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 1c085e8a07e7..56192b22d48d 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -30,7 +30,6 @@
 #include "toolkit/helper/property.hxx"
 #include "toolkit/helper/unopropertyarrayhelper.hxx"
 #include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
 
 //........................................................................
 namespace toolkit
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index f46eafb6ac15..eda76c4dcee9 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -33,7 +33,6 @@
 
 
 #include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
 
 //........................................................................
 namespace toolkit
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 09fa32faf2dc..2b27b1dff48b 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -30,7 +30,6 @@
 #include "toolkit/helper/property.hxx"
 #include "toolkit/helper/unopropertyarrayhelper.hxx"
 #include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
 
 //........................................................................
 namespace toolkit
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 09c59d5761dc..888926e87143 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/window.hxx>
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index 2542f492773d..cf0ce467c1d9 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <tools/b3dtrans.hxx>
-#include <tools/debug.hxx>
 
 /*************************************************************************
 |*
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 2bafd31e416e..14e4a39150db 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -32,7 +32,6 @@
 
 #include <tools/bigint.hxx>
 #include <tools/string.hxx>
-#include <tools/debug.hxx>
 
 #include <string.h>
 #include <ctype.h>
diff --git a/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx
index 80670664ba18..a0a10642d1df 100644
--- a/tools/source/stream/cachestr.cxx
+++ b/tools/source/stream/cachestr.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/cachestr.hxx>
 #include <tools/tempfile.hxx>
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 7eaf8b18f439..4ca353d9c077 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -38,7 +38,6 @@
 #include <windows.h>
 #endif
 
-#include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index a93a58be29b5..b1d1c3f67f49 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 
 #include <osl/mutex.hxx>
 #include <tools/string.hxx>
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index ba15664441f8..84fe68b3e691 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -30,7 +30,6 @@
 #include <unotools/eventcfg.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index c5109ce38ef0..b3dd31da5d6e 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <sal/macros.h>
-#include <tools/debug.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 91b5a88648f6..57d490d0f29c 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -31,7 +31,6 @@
 #include <unotools/historyoptions_const.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 3ddbd9eadc8e..51295be81ec7 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -30,7 +30,6 @@
 #include <unotools/optionsdlg.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 0fc002a84d62..26293ad72dee 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <unotools/streamhelper.hxx>
-#include <tools/debug.hxx>
 
 namespace utl
 {
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index ceef0e9aef2f..b2c14cf268af 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -35,7 +35,6 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
-#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <ucbhelper/content.hxx>
 #include <vector>
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 326ed53fc62b..b042078145c7 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -38,7 +38,6 @@
 
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/content.hxx>
-#include <tools/debug.hxx>
 #include <unotools/streamwrap.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index a34017a1b27f..4301dff0c6d4 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -31,7 +31,6 @@
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
 #include <unotools/configmgr.hxx>
-#include <tools/debug.hxx>
 
 namespace css = com::sun::star;
 
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index 8d45b29d386c..7303a19ba830 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <string.h>
-#include <tools/debug.hxx>
 #include <rtl/instance.hxx>
 #include "psputil.hxx"
 
diff --git a/vcl/headless/svpelement.cxx b/vcl/headless/svpelement.cxx
index fb0447224773..80a47fec5f2f 100644
--- a/vcl/headless/svpelement.cxx
+++ b/vcl/headless/svpelement.cxx
@@ -29,7 +29,6 @@
 #include "headless/svpelement.hxx"
 
 #include <basebmp/scanlineformats.hxx>
-#include <tools/debug.hxx>
 #include <osl/diagnose.h>
 
 #if defined WITH_SVP_LISTENING
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index 036629d85b08..ffc5e4e5c583 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -28,7 +28,6 @@
 
 
 #include <tools/urlobj.hxx>
-#include <tools/debug.hxx>
 
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 79245db73f6e..3011cb282c26 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -28,7 +28,6 @@
 
 
 #include <tools/time.hxx>
-#include <tools/debug.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
diff --git a/vcl/source/components/display.cxx b/vcl/source/components/display.cxx
index cfab922326ac..41368f7f903c 100644
--- a/vcl/source/components/display.cxx
+++ b/vcl/source/components/display.cxx
@@ -39,7 +39,6 @@
 #include <cppuhelper/implbase4.hxx>
 
 #include <vector>
-#include <tools/debug.hxx>
 
 
 using ::rtl::OUString;
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 0b6e4ae8f85e..6772db7b78ef 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <uno/dispatcher.h> // declaration of generic uno interface
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 410c5a4f96a5..61bfe4f53cc5 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include "vcl/svapp.hxx"
 #include "vcl/font.hxx"
 
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 2f70e77c92a7..f4c2de9d876e 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include <vcl/bitmap.hxx>
 
 #include <svdata.hxx>
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 8e487e9f20cd..7e225ea77b6f 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -44,8 +44,6 @@
 #include <vcl/edit.hxx>
 #include <vcl/metric.hxx>
 
-#include <tools/debug.hxx>
-
 using namespace ::com::sun::star::uno;
 
 // useful caption height for title bar buttons
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index d424b7cedc06..31f29c2f186f 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include <vcl/dockingarea.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/menu.hxx>
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index f1e22d8d6ce4..6c1e7348c933 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
-
 #include <vcl/wrkwin.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/introwin.hxx>
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index e7b475599657..fd273cc8d578 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/awt/MouseEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
-#include <tools/debug.hxx>
 #include <vcl/event.hxx>
 
 /** inits this vcl KeyEvent with all settings from the given awt event **/
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index a34d9c99c043..3d2cebfe34e5 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -38,7 +38,6 @@
 #include "vcl/helper.hxx"
 #include "vcl/svapp.hxx"
 #include "cupsmgr.hxx"
-#include "tools/debug.hxx"
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
 #include "tools/zcodec.hxx"
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index dc3e170b85b3..8ece4c7a08d1 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -53,7 +53,6 @@
 #include <osl/thread.h>
 #include <osl/process.h>
 
-#include <tools/debug.hxx>
 #include "unx/i18n_im.hxx"
 #include "unx/i18n_xkb.hxx"
 #include <unx/wmadaptor.hxx>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 3400a2d0a718..d1086b8ee04d 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -50,8 +50,6 @@
 #include <osl/module.h>
 #include <osl/mutex.hxx>
 
-#include <tools/debug.hxx>
-
 #include "unx/kde/kdedata.hxx"
 #include "unx/i18n_im.hxx"
 #include "unx/i18n_xkb.hxx"
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 90841f72a4a9..bf1b89f02398 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -37,7 +37,6 @@
 #include <osl/mutex.hxx>
 
 #include <tools/solarmutex.hxx>
-#include <tools/debug.hxx>
 
 #include <vcl/timer.hxx>
 #include <vcl/apptypes.hxx>
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 5e7c173fbd44..3cc62b7bb077 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -31,7 +31,6 @@
 #include <string.h>
 
 #include <svsys.h>
-#include <tools/debug.hxx>
 
 #include <win/wincomp.hxx>
 #include <win/saldata.hxx>
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 597994ffab49..f0111468be96 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -42,7 +42,6 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/txtimp.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/debug.hxx>
 
 
 
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 1082641c1a7d..e95fec4033af 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -40,7 +40,6 @@
 #include <xmloff/xmluconv.hxx>
 
 #include <tools/color.hxx>
-#include <tools/debug.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 037d401a9261..2a0de75725ab 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -35,8 +35,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
-#include <tools/debug.hxx>
-
 #include <com/sun/star/chart/ChartLegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 55c03682cc90..1cf487e43209 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -36,7 +36,6 @@
 #include "SchXMLTools.hxx"
 #include "transporttypes.hxx"
 #include "XMLStringBufferImportContext.hxx"
-#include <tools/debug.hxx>
 #include <rtl/math.hxx>
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index b7e12ad54a74..1736e8b9a0fb 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <osl/diagnose.h>
-#include <tools/debug.hxx>
 
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 555e3e224853..b3f62c2d6394 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/memory.h>
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 095d3a40d643..3ec2847e060c 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <svl/svarray.hxx>
 #include <xmloff/xmltkmap.hxx>
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index fd699d6f77fd..3bb4fd450775 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index b2027ce17e85..0043beeffda8 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 82884ed2875b..90387a43456b 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 165dda82a049..7ba3002e4c5d 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/presentation/AnimationEffect.hpp>
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index efaf09ebebee..de7f866944ce 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index a91b374a9718..d768624d6a1b 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <com/sun/star/drawing/XLayerSupplier.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 1c968aca09f3..adf19c3fc054 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -44,7 +44,6 @@
 #include <xmloff/xmluconv.hxx>
 #include "xexptran.hxx"
 #include "xmloff/xmlerror.hxx"
-#include <tools/debug.hxx>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 07a82ce42b8d..03975fd35c2d 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
-
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 09aa43419377..47b2a56243ad 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <com/sun/star/util/Duration.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 7a1760771bca..6a5892f4c810 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -42,7 +42,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlmetae.hxx>
 #include "PropertySetMerger.hxx"
-#include <tools/debug.hxx>
 
 #include <unotools/docinfohelper.hxx>
 
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index c2b360d9982f..70e9712ccaa8 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -33,8 +33,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 
-#include <tools/debug.hxx>
-
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index c11c85bdcca2..ce4e6fef3cfe 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -31,7 +31,6 @@
 #include "XMLEventImportHelper.hxx"
 
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
index e4136c653d3b..7c87ab4f57da 100644
--- a/xmloff/source/script/XMLScriptContextFactory.cxx
+++ b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -28,7 +28,6 @@
 
 #include "XMLScriptContextFactory.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index bd70691fe489..a31b44e7fb1a 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -29,7 +29,6 @@
 #include "XMLScriptExportHandler.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index 8efe48eeeed8..859d9a8a66bd 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -28,7 +28,6 @@
 
 #include "XMLStarBasicContextFactory.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 6e072f2141cd..942314b3a5ee 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -29,7 +29,6 @@
 #include "XMLStarBasicExportHandler.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <tools/debug.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index bf474e3f6fb2..658a3c8a2b56 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <xmloff/EnumPropertyHdl.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <comphelper/extract.hxx>
diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
index 70ff3ea0b88e..c09343361cd5 100644
--- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx
+++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 1496483e2473..68b87d0925f8 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <svl/cntnrsrt.hxx>
 #include <tools/fontenum.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
index 179fc13fc399..eaa0ac709339 100644
--- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
+++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "XMLIsPercentagePropertyHandler.hxx"
diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
index ce0a62c0efb5..d86f4ef33647 100644
--- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
+++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
@@ -33,8 +33,6 @@
 
 #include <com/sun/star/uno/Any.hxx>
 
-#include <tools/debug.hxx>
-
 #include <sax/tools/converter.hxx>
 
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 95e40744966e..d0e0004f3706 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <sax/tools/converter.hxx>
 #include <rtl/math.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 
 using namespace com::sun::star;
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 93d50b578ade..7953c5aba347 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -43,8 +43,6 @@
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include "xmloff/xmlerror.hxx"
-#include <tools/debug.hxx>
-
 #include "xmloff/contextid.hxx"
 
 // STL includes
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 82612bdfdbfd..ac3a8e58b045 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <rtl/ustrbuf.hxx>
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index e2dea548449e..795d04458ba6 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -31,7 +31,6 @@
 #ifndef _RTL_USTRING
 #include <rtl/ustring.hxx>
 #endif
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index f37cfa33b5a7..d8f34b3097bb 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -32,8 +32,6 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#include <tools/debug.hxx>
-
 #include <sax/tools/converter.hxx>
 
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 24fd122cd1ea..4cb4bbf6efae 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -31,7 +31,6 @@
 #include "XMLFootnoteImportContext.hxx"
 
 #include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index f757c93cb475..28c799cb41b9 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -44,7 +44,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 298dfcdcb01c..e5963f707161 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -38,7 +38,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <sax/tools/converter.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index 2d0dcfcb3019..66364d963c5f 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -41,7 +41,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx
index decb40dcd183..f55a1129a7a6 100644
--- a/xmloff/source/text/XMLIndexBodyContext.cxx
+++ b/xmloff/source/text/XMLIndexBodyContext.cxx
@@ -32,7 +32,6 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 31302b934503..a5cd7e088dec 100644
--- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
@@ -38,7 +38,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 using ::rtl::OUString;
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 8faafa58ca06..d124d173aa73 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -34,8 +34,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 
-#include <tools/debug.hxx>
-
 #include <sax/tools/converter.hxx>
 
 #include "XMLIndexTemplateContext.hxx"
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 05934e6dacde..138b1d10008e 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -41,7 +41,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <sax/tools/converter.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index 1cf51e9787e6..6ef66ac8ce7b 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -41,7 +41,6 @@
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
index ee08dd0ebe3e..f9d5fdadffd3 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx
@@ -39,7 +39,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <sax/tools/converter.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 304f992dd45a..9da8a388c2ee 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -45,7 +45,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index f924a35ca9f4..0f750eef158f 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -41,7 +41,6 @@
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 
 
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 05b3201d8328..199e56a058a3 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -44,7 +44,6 @@
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/txtprmap.hxx>
-#include <tools/debug.hxx>
 
 #include <vector>
 
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index 0373b4af3d93..12fc36e1c790 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 85355fa5719d..9508bba158af 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index bb3dd914e847..9f623c508fac 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -26,9 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
-
-
 #include <xmloff/xmlimp.hxx>
 #include "xmloff/xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index df51378ab127..a7324cb604bb 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/style/DropCapFormat.hpp>
 #include <sax/tools/converter.hxx>
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 4c1ba62fd7fc..763224e81a75 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -30,7 +30,6 @@
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <tools/debug.hxx>
 #include <svl/svarray.hxx>
 #include <xmloff/xmlimp.hxx>
 #include "XMLTextFrameContext.hxx"
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index a197cebbcc06..139186f4855c 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -28,7 +28,6 @@
 
 
 #include <xmloff/txtparae.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index 645f57d62d34..47d302899390 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -41,9 +41,6 @@
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 
-#include <tools/debug.hxx>
-
-
 using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index 0bd38a4d9367..b2a71e5864b4 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -39,9 +39,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
 
-#include <tools/debug.hxx>
-
-
 using rtl::OUString;
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::Any;
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index b0595ee5030b..e526dc57c03f 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -46,8 +46,6 @@
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/xforms/XModel.hpp>
 
-#include <tools/debug.hxx>
-
 
 using rtl::OUString;
 using com::sun::star::xml::sax::XAttributeList;
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index f754c74c613d..af53c972364e 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -42,7 +42,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/io/XActiveDataSource.hpp>
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 2be9c7ddb0f0..9ab04abeac63 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/debug.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <cppuhelper/factory.hxx>
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index b5e4a13d8c33..a1e5977b2ce0 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -60,7 +60,6 @@
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
-#include <tools/debug.hxx>
 #include <rtl/logfile.hxx>
 
 #include "seinitializer_nssimpl.hxx"
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 9c0d4acdb8be..935bd4311345 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -54,7 +54,6 @@
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.h>
-#include <tools/debug.hxx>
 #include <rtl/logfile.hxx>
 
 #include "seinitializer_nssimpl.hxx"