Removed unnecessary tools includes.

Hello lo-devs,

this patch series removes a lot of unnecessary includes for the various
tools header. The patches without suffix should be applied to the core
repository, the .binfilter.patch suffix should be applied to the
binfilter repository. I've tested the build with the configuration
--enable-binfilter --enable-dbgutil --enable-debug, is this sufficient
or did I miss another important configuration, that enables some
conditional compiled code? I've only build this on linux-x86_64, but the
patch also touches some of the mac specific code like
fpicker/source/aqua/SalAquaFilePicker.mm so it would be maybe a good
idea to test this patch.

regards Marcel Metz

110 files changed, 12 insertions, 116 deletions

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 72149878986b..49d15f6e4dc5 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -31,7 +31,6 @@
 
 #include "sb.hxx"
 #include <tools/rcid.h>
-#include <tools/config.hxx>
 #include <tools/stream.hxx>
 #include <tools/errinf.hxx>
 #include <basic/sbx.hxx>
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 164399da6741..44f44b2777e7 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -34,7 +34,6 @@
 #include "DiagramHelper.hxx"
 #include "ChartModelHelper.hxx"
 
-#include <tools/color.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 73efde66458c..7ad28f1c9a87 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -38,7 +38,6 @@
 #include "ChartTypeHelper.hxx"
 #include "ThreeDHelper.hxx"
 #include <editeng/unoprnms.hxx>
-#include <tools/color.hxx>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 38e085eed270..47da6f6048aa 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -52,7 +52,6 @@
 
 
 #include <editeng/unoprnms.hxx>
-#include <tools/color.hxx>
 #include <rtl/math.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index f9e5413c9a37..b4b841a01b4d 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -49,7 +49,6 @@
 #include "connectivity/sdbcx/VColumn.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <osl/thread.h>
-#include <tools/config.hxx>
 #include <comphelper/sequence.hxx>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index a02759d39108..9a0e97a9557e 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -36,7 +36,6 @@
 #include "flat/EConnection.hxx"
 #include "flat/EColumns.hxx"
 #include <osl/thread.h>
-#include <tools/config.hxx>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
 #include <stdio.h>      //sprintf
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index df07060928ca..74d79e894dc7 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -63,7 +63,6 @@
 
 #include <ucbhelper/content.hxx>
 #include <osl/module.h>
-#include <tools/config.hxx>
 
 #include <stdio.h>
 
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 2e11a08597b7..f73f6e4dc8b3 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -63,7 +63,6 @@
 
 #include <ucbhelper/content.hxx>
 #include <osl/module.h>
-#include <tools/config.hxx>
 
 #include <stdio.h>
 #include <osl/thread.hxx>
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 63d70f604ecb..cca1fa813af8 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <unotools/localfilehelper.hxx>
-#include <tools/config.hxx>
 #include <vcl/image.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 58a37b106a8b..c6f6b7341780 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -35,7 +35,6 @@
 #include <sfx2/app.hxx>
 #include <svl/aeitem.hxx>
 #include <svtools/svtabbx.hxx>
-#include <tools/config.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/defaultoptions.hxx>
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 897f88978414..27296c3f808f 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -34,7 +34,6 @@
 #include <sfx2/passwd.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/bigint.hxx>
 #include <tools/debug.hxx>
 #include "Acomponentmodule.hxx"
 #include <unotools/tempfile.hxx>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index f56819dd7ff5..aee125c8493a 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -91,7 +91,6 @@
 #include <sfx2/sfx.hrc>
 #include <svx/fmsearch.hxx>
 #include <svx/svxdlg.hxx>
-#include <tools/color.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index e558ecf73668..bf42f7537d51 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -29,7 +29,6 @@
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/datetime.hxx>
 #include <unotools/configmgr.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 3c0522956d22..ab6fdf97103c 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -55,7 +55,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <tools/debug.hxx>
-#include <tools/tempfile.hxx>
 #include <ucbhelper/configurationkeys.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 622d2424bf21..c8d0c93ccb63 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -40,7 +40,6 @@
 #include <unotools/bootstrap.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/uri.hxx>
-#include <tools/config.hxx>
 #include <i18npool/lang.h>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 8b1e477308c8..374655db38ad 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -45,7 +45,6 @@
 #include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
 #include <vcl/vclenum.hxx>
-#include <tools/bigint.hxx>
 #include <tools/tenccvt.hxx>
 
 #include <rtl/ustring.hxx>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 240fccd16abc..7f2e710d5db4 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -28,7 +28,6 @@
 
 
 #include <ctype.h>
-#include <tools/datetime.hxx>
 #include <rtl/tencinfo.h>
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index b7957f99a448..98912a603a8b 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/presentation/XPresentation.hpp>
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
 #include <tools/debug.hxx>
-#include <tools/color.hxx>
 #include <vcl/window.hxx>
 #include <rtl/textenc.h>
 #include <rtl/locale.h>
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index b7fe581293e0..5e1fcc947963 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -29,7 +29,6 @@
 #define _SVT_SANEDLG_HXX
 
 #include <vcl/dialog.hxx>
-#include <tools/config.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 9771c0d08d8c..8a1410f8ee3c 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -29,7 +29,6 @@
 
 #include <vcl/sv.h>
 #include <tools/stream.hxx>
-#include <tools/bigint.hxx>
 #include <tools/poly.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 0a45a2fa78d9..76cffbf4e3cb 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -48,8 +48,6 @@
 
 #include <vcl/timer.hxx>
 
-#include <tools/date.hxx>
-
 //.........................................................................
 namespace frm
 {
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 497fd570d522..e15e3a620119 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -30,7 +30,6 @@
 #define _FORMS_EDITBASE_HXX_
 
 #include "FormComponent.hxx"
-#include <tools/date.hxx>
 #include <tools/link.hxx>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 564555486f78..c8e4fd72ae75 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -32,9 +32,6 @@
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #if OSL_DEBUG_LEVEL > 0
-    #ifndef _TOOLS_TEMPFILE_HXX
-    #include <tools/tempfile.hxx>
-    #endif
     #ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
     #include <unotools/ucbstreamhelper.hxx>
     #endif
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 9b46c099ec1b..d4cf9a19db48 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -47,7 +47,6 @@
 
 //_______________________________________
 // other includes
-#include <tools/datetime.hxx>
 #include <rtl/ustring.hxx>
 
 //_______________________________________
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 1719070aa038..5b215f5e61ad 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -72,11 +72,8 @@
 #include <rtl/ustring.hxx>
 
 #include <vcl/image.hxx>
-#include <tools/color.hxx>
 #include <rtl/ref.hxx>
 
-#include <vector>
-
 namespace framework
 {
     class ImageManagerImpl;
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index eee1629a3308..315f8143685c 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -72,11 +72,8 @@
 #include <rtl/ustring.hxx>
 
 #include <vcl/image.hxx>
-#include <tools/color.hxx>
 #include <rtl/ref.hxx>
 
-#include <vector>
-
 namespace framework
 {
     class ImageManagerImpl;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index d5e4561be585..0a60a9b84d0a 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -36,7 +36,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <tools/color.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include "com/sun/star/util/XMacroExpander.hpp"
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 8b8ac60e70d3..fdf3721f740e 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -53,7 +53,6 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
-#include <tools/config.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <svtools/menuoptions.hxx>
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 64c485c3a7f1..134471ac26f5 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -40,7 +40,6 @@
 
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/tempfile.hxx>
 #include <unotools/tempfile.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 754579de3be8..7f73540dfab6 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -71,11 +71,8 @@
 #include <rtl/ustring.hxx>
 
 #include <vcl/image.hxx>
-#include <tools/color.hxx>
 #include <rtl/ref.hxx>
 
-#include <vector>
-
 namespace framework
 {
     class CmdImageList
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 91b5e1d49888..6d5f398b2235 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -34,7 +34,6 @@
 #include <hash.hxx>
 #include <lex.hxx>
 #include <globals.hxx>
-#include <tools/bigint.hxx>
 #include <rtl/strbuf.hxx>
 
 rtl::OString SvToken::GetTokenAsString() const
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 2944627521d7..c48df6ac483b 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include "export.hxx"
-#include <tools/datetime.hxx>
 #include <stdio.h>
 #include <osl/time.h>
 #include <osl/process.h>
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d23f4268b888..9db6d152e324 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -36,6 +36,7 @@
 #include "vcl/msgbox.hxx"
 #include "vcl/strhelper.hxx"
 
+#include <tools/config.hxx>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
 #include <comphelper/string.hxx>
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 6ab1dfc69677..4a54aab5b0c5 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include <stdio.h>
+#include <tools/config.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <rtsetup.hrc>
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 4dd49e59e391..c804b27dc851 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -30,7 +30,6 @@
 #define _PAD_COMMANDDLG_HXX_
 
 #include <vcl/dialog.hxx>
-#include <tools/config.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 972e2b76cb7f..3521a0c700f4 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -40,6 +40,7 @@
 #include "vcl/svapp.hxx"
 #include "vcl/mnemonic.hxx"
 
+#include "tools/config.hxx"
 #include "tools/urlobj.hxx"
 
 #include "osl/file.hxx"
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 337bb145f7ff..4f39f03b6727 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -31,7 +31,6 @@
 #include <list>
 #include <rtl/ustring.hxx>
 #include <vcl/dialog.hxx>
-#include <tools/config.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 8327c5e5d688..4a3ed8a22a90 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -33,6 +33,7 @@
 #include "core_resource.hxx"
 #include <comphelper/sequence.hxx>
 #include "Tools.hxx"
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
 #include "FormatCondition.hxx"
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 73315be74314..82f7de71efc3 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -28,6 +28,7 @@
 #include "FormatCondition.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include "corestrings.hrc"
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index d9b9c98a472f..d138f55caf93 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -32,6 +32,7 @@
 #include "core_resource.hrc"
 #include "core_resource.hxx"
 #include <comphelper/sequence.hxx>
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/property.hxx>
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 6b9bf51b6190..6dea31f9472a 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -33,6 +33,7 @@
 #include "core_resource.hxx"
 #include <comphelper/sequence.hxx>
 #include "Tools.hxx"
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/property.hxx>
 #include "FormatCondition.hxx"
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 44f3b6c1eaa3..f7641379de19 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -36,7 +36,6 @@
 #include "com/sun/star/container/XContainer.hpp"
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <tools/color.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 52867e479f8a..3b0dd3ecd151 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -64,7 +64,6 @@
 #include <svl/poolitem.hxx>
 #include <tools/time.hxx>
 #include <svl/solar.hrc>
-#include <tools/date.hxx>
 #include <svl/brdcst.hxx>
 #include <svx/svxids.hrc>
 #include <svl/memberid.hrc>
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index d2cba2e8d06a..a6de6bd69fed 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -36,7 +36,6 @@
 #include "cell.hxx"
 #include <tools/string.hxx>
 
-#include <tools/color.hxx>
 #include "flttypes.hxx"
 #include "ftools.hxx"
 
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 6274bd8019f0..ebd5c77479cd 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -33,7 +33,6 @@
 #include <svl/zforlist.hxx>
 #include <tools/string.hxx>
 #include <vcl/vclenum.hxx>
-#include <tools/color.hxx>
 
 
 #include <vector>
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index aa0115e1b931..2672dc7941eb 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -58,7 +58,6 @@
 #include <tools/ref.hxx>
 #include <tools/link.hxx>
 #include <tools/time.hxx>
-#include <tools/date.hxx>
 #include <svl/svarray.hxx>
 #include <vcl/sv.h>
 #include <vcl/timer.hxx>
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index 460e0a83ba8c..ff315c1012ae 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -35,7 +35,6 @@
 #include "cell.hxx"
 #include <tools/string.hxx>
 
-#include <tools/color.hxx>
 #include "flttypes.hxx"
 #include "ftools.hxx"
 #include "qprostyle.hxx"
diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx
index f52ce655d4bf..2b7f4eef6c63 100644
--- a/sc/source/filter/inc/qprostyle.hxx
+++ b/sc/source/filter/inc/qprostyle.hxx
@@ -36,7 +36,6 @@
 #include "cell.hxx"
 #include <tools/string.hxx>
 
-#include <tools/color.hxx>
 #include "flttypes.hxx"
 #include "ftools.hxx"
 
diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx
index 29288396b634..84a5e940b00a 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -36,7 +36,6 @@
 #include "qpro.hxx"
 #include "qprostyle.hxx"
 
-#include <tools/color.hxx>
 #include <scitems.hxx>
 #include <svx/algitem.hxx>
 #include <editeng/udlnitem.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index d703be598313..b4fad11de92d 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -42,7 +42,6 @@
 #include <comphelper/servicehelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <vcl/unohelp.hxx>
-#include <tools/color.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 66622eeb7551..9be80b553c9a 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -54,7 +54,6 @@
 #include <tools/resmgr.hxx>
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
-#include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index d4f450f222da..d79f439a6f01 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -29,7 +29,6 @@
 #include <eppt.hxx>
 #include "epptdef.hxx"
 #include <tools/globname.hxx>
-#include <tools/datetime.hxx>
 #include <tools/poly.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index ffe25cac0d1f..ee9d816d5e27 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <propread.hxx>
-#include <tools/bigint.hxx>
 #include "tools/debug.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textenc.h"
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index a2be69dc821e..fec78f72b65c 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -36,7 +36,6 @@
 #include <sot/storage.hxx>
 #include <tools/gen.hxx>
 #include <tools/stream.hxx>
-#include <tools/datetime.hxx>
 
 #include <tools/string.hxx>
 
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index fd88486912ff..777b78c56be2 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -31,9 +31,6 @@
 
 #include <com/sun/star/office/XAnnotation.hpp>
 
-#include <tools/datetime.hxx>
-#include <tools/date.hxx>
-
 #include <vcl/ctrl.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index b85428c72e5f..64686d90694b 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -38,7 +38,6 @@
 #include "sdmod.hxx"
 #include "sdiocmpt.hxx"
 #include "morphdlg.hrc"
-#include <tools/config.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xenum.hxx>
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 61c2ad79999d..32f36d79ad2f 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -41,7 +41,6 @@
 #include "DrawDocShell.hxx"
 #include "vectdlg.hxx"
 #include "vectdlg.hrc"
-#include <tools/config.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/metaact.hxx>
diff --git a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
index d42212b74412..3f059a3a2dda 100644
--- a/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
@@ -37,7 +37,6 @@
 #include "drawdoc.hxx"
 #include "app.hrc"
 #include <vcl/bitmap.hxx>
-#include <tools/color.hxx>
 
 namespace sd { namespace toolpanel { namespace controls {
 
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 8795e805a19f..c4200c40c2f4 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -36,7 +36,6 @@
 #include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
 #include <tools/simplerm.hxx>
-#include <tools/config.hxx>
 #include <basic/basrdll.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 868a07c297ba..47b12fa0f8ce 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/util/XFlushable.hpp>
 
 #include <stdlib.h>
-#include <tools/config.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/string.hxx>
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 055f130a8e2a..8af046cbb4b2 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/cachestr.hxx>
 #include <tools/config.hxx>
 #include <svl/inetstrm.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index f4f2005cc8f9..8440355afbad 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -37,7 +37,6 @@
 #include <svtools/svtools.hrc>
 #include <unotools/saveopt.hxx>
 #include <unotools/localisationoptions.hxx>
-#include <tools/config.hxx>
 #include <tools/resary.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/intitem.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 461027b40e33..f59905bf9a9f 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 #include <tools/urlobj.hxx>
-#include <tools/config.hxx>
 #include <svtools/ehdl.hxx>
 #include <unotools/startoptions.hxx>
 #include <svl/itempool.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index eaef4b41ce49..0ec2e702bf00 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <tools/config.hxx>
 #include <tools/rcid.h>
 #include <osl/mutex.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 33c8932f3e9d..f6eb9caef52f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -57,7 +57,6 @@
 #include <unotools/intlwrapper.hxx>
 
 #include <unotools/configmgr.hxx>
-#include <tools/config.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <svl/intitem.hxx>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 5e44bbf5e4de..7680ff2a0aae 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -90,7 +90,6 @@
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 
-#include <tools/cachestr.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
 #include <framework/documentundoguard.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8bcfb94106db..6b09c100bea8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -96,7 +96,6 @@
 #include <unotools/viewoptions.hxx>
 #include <svtools/svtdata.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/cachestr.hxx>
 #include <unotools/streamhelper.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 4926581350b1..580603c7d284 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -40,7 +40,6 @@
 #include <comphelper/sequenceashashmap.hxx>
 
 #include <sot/exchange.hxx>
-#include <tools/config.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbstar.hxx>
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 6458053f5442..e1aa2e514e55 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <comphelper/processfactory.hxx>
-#include <tools/config.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 90bf8194f987..11754d402535 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -72,7 +72,6 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <tools/zcodec.hxx>
-#include <tools/cachestr.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index d1b967706d91..38073547f2b3 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <tools/cachestr.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b652fe69eb32..3fbe37d4dc08 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -80,7 +80,6 @@
 #include <unotools/securityoptions.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/cachestr.hxx>
 #include <unotools/streamwrap.hxx>
 
 #include <unotools/saveopt.hxx>
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 85a3b2732d35..f06a6ce3c927 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -35,7 +35,6 @@
 
 #include <tools/string.hxx>
 #include <tools/errcode.hxx>
-#include <tools/bigint.hxx>
 
 // class SfxContentHelper ------------------------------------------------
 
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index b9e227051e5c..ee17d65746dd 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -63,7 +63,6 @@
 #include <sfx2/shell.hxx>
 #include <sal/types.h>
 #include <sal/config.h>
-#include <tools/date.hxx>
 #include <vcl/accel.hxx>
 #include <tools/resid.hxx>
 #include <tools/rc.hxx>
@@ -138,7 +137,6 @@
 #include <sfx2/sfx.hrc>
 #include <svl/memberid.hrc>
 #include <vcl/syswin.hxx>
-#include <tools/datetime.hxx>
 #include <tools/wldcrd.hxx>
 #include <parse.hxx>
 #include <types.hxx>
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 186d6311e5d4..5871ec025dcf 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -29,7 +29,6 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/servicehelper.hxx>
 
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 45b571254bee..50227d26f571 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/color.hxx>
 #include <tools/debug.hxx>
 #include <unotools/configitem.hxx>
 #include <unotools/configpathes.hxx>
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7717d467059c..9f1c92f2de40 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -59,7 +59,6 @@
 #include <algorithm>
 #include <memory>
 #include <tools/urlobj.hxx>
-#include <tools/datetime.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/svtools/source/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index d33204d12f82..ccf403ef5422 100644
--- a/svtools/source/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -32,7 +32,6 @@
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
-#include <tools/config.hxx>
 #include <svtools/filter.hxx>
 #include "FilterConfigCache.hxx"
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/svtools/source/filter/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx
index 06025f2aa8e6..7d25f708db5f 100644
--- a/svtools/source/filter/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -34,6 +34,7 @@
 #include "emfwr.hxx"
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
+#include <tools/bigint.hxx>
 #include <tools/tenccvt.hxx>
 #include <osl/endian.h>
 #include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType
diff --git a/svtools/source/filter/wmf/wmfwr.hxx b/svtools/source/filter/wmf/wmfwr.hxx
index 75cf46c0bcb3..d33b03cce37f 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/bigint.hxx>
 #include <tools/debug.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graph.hxx>
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 73d6dc03a570..b2824fd97344 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -39,7 +39,6 @@
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/color.hxx>
 
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 33c276a50516..97772cd8a810 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -30,7 +30,6 @@
 #include <tools/urlobj.hxx>
 #include <svl/zformat.hxx>
 #include <svl/macitem.hxx>
-#include <tools/cachestr.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
 
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 2641f16eb124..c397078a72ae 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -39,7 +39,6 @@
 #include <vcl/field.hxx>
 
 #include <vcl/button.hxx>
-#include <tools/date.hxx>
 #include <tools/ref.hxx>
 #include <svtools/editbrowsebox.hxx>
 #include <osl/mutex.hxx>
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 7e48ec372ae7..3e8318e88c17 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -29,7 +29,6 @@
 #ifndef _SVDOGRP_HXX
 #define _SVDOGRP_HXX
 
-#include <tools/datetime.hxx>
 #include <svx/svdobj.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 9c6d3a5767b2..5ff617f3ae48 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -105,7 +105,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/color.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 0d47f4a149bd..83f4ec3785bc 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <osl/mutex.hxx>
-#include <tools/color.hxx>
 #include <tools/string.hxx>
 #include <vcl/image.hxx>
 #include <comphelper/accessibleselectionhelper.hxx>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index feee99794edf..9c9fcf085ee6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -40,7 +40,6 @@
 #include <svl/whiter.hxx>
 #include <svl/style.hxx>
 #include <editeng/editstat.hxx>
-#include <tools/config.hxx>
 #include <vcl/cursor.hxx>
 #include <editeng/unotext.hxx>
 
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index f8322443be15..3b3fb8296460 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -41,10 +41,8 @@
 #include <vcl/bmpacc.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
-#include <tools/config.hxx>
 #include <unotools/cacheoptions.hxx>
 #include <svl/whiter.hxx>
-#include <tools/bigint.hxx>
 #include "editeng/fontitem.hxx"
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 26e4fd35de8b..cd0a835d01a3 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -28,7 +28,6 @@
 
 
 #include <svx/svdhlpln.hxx>
-#include <tools/color.hxx>
 
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 92a854492bcd..1fd60261ba95 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -83,7 +83,6 @@
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
-#include <tools/bigint.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/bulitem.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 746873b2cf65..cafb87d44fd3 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <svl/style.hxx>
-#include <tools/bigint.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstwit.hxx>
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 24f3fd11cc30..839f6721f6d5 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -35,7 +35,6 @@
 #include <vcl/window.hxx>
 #include <swrect.hxx>
 
-#include <tools/datetime.hxx>
 #include <tools/date.hxx>
 
 #include <vcl/lineinfo.hxx>
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index c0e537a7d52c..ede0b0686ad5 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -46,7 +46,6 @@
 #include <editeng/unolingu.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <unotools/useroptions.hxx>
-#include <tools/datetime.hxx>
 #include <svl/zforlist.hxx>
 #include <swmodule.hxx>
 #include <doc.hxx>
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 47e6cc1d191b..bf6b7ac98cf4 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -29,7 +29,6 @@
 #define _FLTINI_HXX
 
 #include <shellio.hxx>
-#include <tools/color.hxx>
 
 class SwNumRuleTbl;
 class SwDoc;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 9cac3eb94c28..2b9f93f2de30 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -37,7 +37,6 @@
 #include <list>
 #include <algorithm>
 #include <tools/solar.h>        // UINTXX
-#include <tools/datetime.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include "hash_wrap.hxx"
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index a51fa9795391..6cf56b192ddf 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -37,7 +37,6 @@
 
 
 #include <redline.hxx>
-#include <tools/datetime.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/svstdarr.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index c7fbc18a3fe3..c055826d3ca6 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -67,7 +67,6 @@
 #include <svx/unoshape.hxx>
 #include <svx/svdpagv.hxx>
 #include <swerror.h>
-#include <tools/cachestr.hxx>
 #include <shellio.hxx>
 #include <ndtxt.hxx>
 #include <SwStyleNameMapper.hxx>
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index b0cb3d2e77c9..a930f8371f67 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -54,7 +54,6 @@
 #define LOWER(aString)  (aString.Lower())
 
 #include <time.h>
-#include <tools/datetime.hxx>
 
 inline Time Unx2Time( time_t nTime )
 {
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 1a60d7c02e50..cc6d77bd672b 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -42,7 +42,6 @@
 #include <tools/debug.hxx>
 #include <tools/wldcrd.hxx>
 #include <tools/fsys.hxx>
-#include <tools/bigint.hxx>
 #include <vector>
 
 int Sys2SolarError_Impl( int nSysErr );
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 25e7da274f93..4343d085174d 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -32,7 +32,6 @@
 
 #include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
-#include <tools/datetime.hxx>
 #include <tools/inetmime.hxx>
 
 namespace unnamed_tools_inetmime {} using namespace unnamed_tools_inetmime;
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 74f70365a3fc..9fbcf0c9fe93 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -39,7 +39,6 @@
 
 #include "osl/mutex.hxx"
 #include <com/sun/star/uno/Sequence.hxx>
-#include "tools/datetime.hxx"
 #include "svl/zforlist.hxx"
 #include "vcl/svapp.hxx"
 
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index f8a082b75fce..37f0bf79b3b7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -47,7 +47,6 @@
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
 #include "tools/debug.hxx"
-#include "tools/config.hxx"
 
 #include "osl/file.hxx"
 #include "osl/process.h"
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 49bd3d92f1e2..bcd330fae3f4 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -29,11 +29,6 @@
 
 #include <comphelper/string.hxx>
 
-#ifndef _BIGINT_HXX
-#define _TOOLS_BIGINT
-#include "tools/bigint.hxx"
-#endif
-
 #include "tools/debug.hxx"
 
 #include "tools/rc.h"
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index a8034774ed26..6e028ea66c79 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -32,8 +32,8 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <ooxml/resourceids.hxx>
-#include <tools/color.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/color.hxx>
 #include <algorithm>
 #include <functional>
 
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx
index 5de8adf632ff..943eb2d2aa09 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
-#include <tools/color.hxx>
 #include <xmloff/uniref.hxx>
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 273a026b39b6..1082641c1a7d 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -39,6 +39,7 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
 
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 58989d158c1b..90100ce59310 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -34,7 +34,6 @@
 #include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <tools/rtti.hxx>
-#include <tools/color.hxx>
 #include <ximpshap.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 456362a213a9..608491658db4 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -40,7 +40,6 @@
 #include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
-#include <tools/datetime.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index aa76df0e4dc7..967d5a71afce 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -39,6 +39,7 @@
 #include "xmloff/xmlnmspe.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlexp.hxx>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 56a4dc66c152..8dc109ad3316 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -36,6 +36,7 @@
 #include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <i18npool/mslangid.hxx>
+#include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>