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

---
 basic/source/classes/sb.cxx                        |    1 -
 chart2/source/view/axes/VAxisProperties.cxx        |    1 -
 chart2/source/view/diagram/VDiagram.cxx            |    1 -
 chart2/source/view/main/ShapeFactory.cxx           |    1 -
 connectivity/source/drivers/calc/CTable.cxx        |    1 -
 connectivity/source/drivers/flat/ETable.cxx        |    1 -
 connectivity/workben/testmoz/main.cxx              |    1 -
 connectivity/workben/testmoz/mozthread.cxx         |    1 -
 cui/source/dialogs/hldocntp.cxx                    |    1 -
 cui/source/options/optpath.cxx                     |    1 -
 dbaccess/source/ext/adabas/AdabasNewDb.cxx         |    1 -
 dbaccess/source/ui/browser/brwctrlr.cxx            |    1 -
 desktop/source/app/appfirststart.cxx               |    1 -
 desktop/source/app/appinit.cxx                     |    1 -
 desktop/source/migration/migration.cxx             |    1 -
 editeng/source/items/textitem.cxx                  |    1 -
 editeng/source/rtf/svxrtf.cxx                      |    1 -
 extensions/source/nsplugin/source/so_instance.cxx  |    1 -
 extensions/source/scanner/sanedlg.hxx              |    1 -
 filter/source/graphicfilter/eps/eps.cxx            |    1 -
 forms/source/component/ComboBox.hxx                |    2 --
 forms/source/component/EditBase.hxx                |    1 -
 forms/source/richtext/richtextvclcontrol.cxx       |    3 ---
 framework/inc/jobs/jobdata.hxx                     |    1 -
 framework/inc/uiconfiguration/imagemanager.hxx     |    3 ---
 .../inc/uiconfiguration/moduleimagemanager.hxx     |    3 ---
 framework/source/fwe/classes/addonsoptions.cxx     |    1 -
 framework/source/fwe/classes/bmkmenu.cxx           |    1 -
 framework/source/services/sessionlistener.cxx      |    1 -
 .../source/uiconfiguration/imagemanagerimpl.hxx    |    3 ---
 idl/source/cmptools/lex.cxx                        |    1 -
 l10ntools/source/export2.cxx                       |    1 -
 padmin/source/adddlg.cxx                           |    1 +
 padmin/source/cmddlg.cxx                           |    1 +
 padmin/source/cmddlg.hxx                           |    1 -
 padmin/source/newppdlg.cxx                         |    1 +
 padmin/source/padialog.hxx                         |    1 -
 reportdesign/source/core/api/FixedText.cxx         |    1 +
 reportdesign/source/core/api/FormatCondition.cxx   |    1 +
 reportdesign/source/core/api/FormattedField.cxx    |    1 +
 reportdesign/source/core/api/ImageControl.cxx      |    1 +
 .../source/core/inc/ReportControlModel.hxx         |    1 -
 sc/source/core/inc/core_pch.hxx                    |    1 -
 sc/source/filter/inc/biff.hxx                      |    1 -
 sc/source/filter/inc/excrecds.hxx                  |    1 -
 sc/source/filter/inc/filt_pch.hxx                  |    1 -
 sc/source/filter/inc/qpro.hxx                      |    1 -
 sc/source/filter/inc/qprostyle.hxx                 |    1 -
 sc/source/filter/qpro/qprostyle.cxx                |    1 -
 .../ui/Accessibility/AccessibleContextBase.cxx     |    1 -
 sc/source/ui/inc/ui_pch.hxx                        |    1 -
 sd/source/filter/eppt/eppt.cxx                     |    1 -
 sd/source/filter/ppt/propread.cxx                  |    1 -
 sd/source/filter/ppt/propread.hxx                  |    1 -
 sd/source/ui/annotations/annotationwindow.hxx      |    3 ---
 sd/source/ui/dlg/morphdlg.cxx                      |    1 -
 sd/source/ui/dlg/vectdlg.cxx                       |    1 -
 .../controls/RecentMasterPagesSelector.cxx         |    1 -
 sfx2/source/appl/app.cxx                           |    1 -
 sfx2/source/appl/appcfg.cxx                        |    1 -
 sfx2/source/appl/appdata.cxx                       |    1 -
 sfx2/source/appl/appinit.cxx                       |    1 -
 sfx2/source/appl/appmain.cxx                       |    1 -
 sfx2/source/appl/appmisc.cxx                       |    1 -
 sfx2/source/appl/appserv.cxx                       |    1 -
 sfx2/source/appl/appuno.cxx                        |    1 -
 sfx2/source/appl/newhelp.cxx                       |    1 -
 sfx2/source/bastyp/fltfnc.cxx                      |    1 -
 sfx2/source/doc/docfac.cxx                         |    1 -
 sfx2/source/doc/docfile.cxx                        |    1 -
 sfx2/source/doc/objcont.cxx                        |    1 -
 sfx2/source/doc/objstor.cxx                        |    1 -
 sfx2/source/inc/helper.hxx                         |    1 -
 starmath/source/math_pch.cxx                       |    2 --
 svl/source/numbers/numuno.cxx                      |    1 -
 svtools/source/config/colorcfg.cxx                 |    1 -
 svtools/source/contnr/fileview.cxx                 |    1 -
 svtools/source/filter/filter2.cxx                  |    1 -
 svtools/source/filter/wmf/wmfwr.cxx                |    1 +
 svtools/source/filter/wmf/wmfwr.hxx                |    1 -
 svtools/source/misc/wallitem.cxx                   |    1 -
 svtools/source/svhtml/htmlout.cxx                  |    1 -
 svx/inc/svx/gridctrl.hxx                           |    1 -
 svx/inc/svx/svdogrp.hxx                            |    1 -
 svx/source/form/fmshimp.cxx                        |    1 -
 svx/source/inc/charmapacc.hxx                      |    1 -
 svx/source/svdraw/svdedxv.cxx                      |    1 -
 svx/source/svdraw/svdetc.cxx                       |    2 --
 svx/source/svdraw/svdhlpln.cxx                     |    1 -
 svx/source/svdraw/svdmodel.cxx                     |    1 -
 svx/source/svdraw/svdocirc.cxx                     |    1 -
 sw/inc/SidebarWin.hxx                              |    1 -
 sw/source/core/bastyp/calc.cxx                     |    1 -
 sw/source/filter/inc/fltini.hxx                    |    1 -
 sw/source/filter/ww8/ww8scan.hxx                   |    1 -
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx      |    1 -
 sw/source/ui/uno/unotxvw.cxx                       |    1 -
 tools/source/fsys/unx.hxx                          |    1 -
 tools/source/fsys/wntmsc.cxx                       |    1 -
 tools/source/inet/inetmime.cxx                     |    1 -
 uui/source/iahndl-ssl.cxx                          |    1 -
 vcl/generic/fontmanager/fontmanager.cxx            |    1 -
 vcl/source/control/field.cxx                       |    5 -----
 writerfilter/source/dmapper/ConversionHelper.cxx   |    2 +-
 xmloff/inc/xmloff/shapeimport.hxx                  |    1 -
 xmloff/source/chart/SchXMLAxisContext.cxx          |    1 +
 xmloff/source/draw/ximp3dscene.hxx                 |    1 -
 xmloff/source/forms/propertyimport.cxx             |    1 -
 xmloff/source/style/TransGradientStyle.cxx         |    1 +
 xmloff/source/style/xmlnumfi.cxx                   |    1 +
 110 files changed, 12 insertions(+), 116 deletions(-)


diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 7214987..49d15f6 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 164399d..44f44b2 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 73efde6..7ad28f1 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 38e085e..47da6f6 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 f9e5413..b4b841a 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 1e49f01..527db3c 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 df07060..74d79e8 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 2e11a08..f73f6e4 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 63d70f6..cca1fa8 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 c6b87d0..5e85ccc 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 4c31eff..cb9b8d6 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 f56819d..aee125c 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 e558ecf..bf42f75 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 3c05229..ab6fdf9 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 622d242..c8d0c93 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 8b1e477..374655d 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 240fccd..7f2e710 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 b7957f9..98912a6 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 b7fe581..5e1fcc9 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 9771c0d..8a1410f 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 0a45a2f..76cffbf 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 497fd57..e15e3a6 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 5645554..c8e4fd7 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 9b46c09..d4cf9a1 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 1719070..5b215f5 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 eee1629..315f814 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 d5e4561..0a60a9b 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 8b8ac60..fdf3721 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 64c485c..134471a 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 754579d..7f73540 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 91b5e1d..6d5f398 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 2944627..c48df6a 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 d23f426..9db6d15 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 6ab1dfc..4a54aab 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 4dd49e5..c804b27 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 972e2b7..3521a0c 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 337bb14..4f39f03 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 8327c5e..4a3ed8a 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 73315be..82f7de7 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 d9b9c98..d138f55 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 6b9bf51..6dea31f 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 44f3b6c..f764137 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 52867e4..3b0dd3e 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 d2cba2e..a6de6bd 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 6274bd80..ebd5c77 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 aa0115e..2672dc7 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 460e0a8..ff315c1 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 f52ce65..2b7f4ee 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 2928839..84a5e94 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 d703be5..b4fad11 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 66622ee..9be80b5 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 d4f450f..d79f439 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 ffe25ca..ee9d816 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 a2be69d..fec78f7 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 fd88486..777b78c 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 b85428c..64686d9 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 61c2ad7..32f36d7 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 d42212b..3f059a3 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 8795e80..c4200c4 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 f035e02..ca3e4fa 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 4d8e910..ee1443a 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 f4f2005..8440355 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 461027b..f59905b 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 eaef4b4..0ec2e70 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 33c8932..f6eb9ca 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 5e44bbf..7680ff2 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 e435e12..3c7cad8 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 4926581..580603c 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 6458053..e1aa2e5 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 fd2fb1e..abe827e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -73,7 +73,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 d1b9677..3807354 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 b652fe6..3fbe37d 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 85a3b27..f06a6ce 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 b9e2270..ee17d65 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 186d631..5871ec0 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 45b5712..50227d2 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 f726a09..7083a78 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 d33204d..ccf403e 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 06025f2..7d25f70 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 75cf46c..d33b03c 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 73d6dc0..b2824fd 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 33c276a..97772cd 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 2641f16..c397078 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 7e48ec3..3e8318e 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 e261c21..9dcd4e1 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -104,7 +104,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 0d47f4a..83f4ec3 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 feee997..9c9fcf0 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 f832244..3b3fb829 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 26e4fd3..cd0a835 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 92a8544..1fd6026 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 746873b..cafb87d 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 24f3fd1..839f672 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 c0e537a..ede0b06 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 5b546c0..d82b58c 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 9cac3eb..2b9f93f 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 a51fa97..6cf56b1 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 c7fbc18..c055826 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 b0cb3d2..a930f83 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 1a60d7c..cc6d77b 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 25e7da2..4343d08 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 74f7036..9fbcf0c 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 f8a082b..37f0bf7 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 49bd3d9..bcd330f 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 a803477..6e028ea 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 5de8adf..943eb2d 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 273a026..1082641 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 58989d15..90100ce 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 456362a..6084916 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 aa76df0..967d5a7 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 56a4dc6..8dc109a 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>
 

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to