[Libreoffice] [PATCH 2/5] Removed unnecessary tools includes.

Marcel Metz <mmetz -AT- adrian-broher.net>
Tue, 03 Jan 2012 15:12:48 +0100

---
 avmedia/inc/avmedia/mediaplayer.hxx                |    1 -
 avmedia/source/quicktime/quicktimecommon.hxx       |    1 -
 avmedia/source/viewer/mediawindow_impl.cxx         |    1 -
 avmedia/source/win/wincommon.hxx                   |    1 -
 basctl/source/basicide/scriptdocument.cxx          |    1 -
 basic/source/classes/propacc.cxx                   |    1 -
 .../source/drivers/calc/CDatabaseMetaData.cxx      |    1 -
 connectivity/source/drivers/dbase/DConnection.cxx  |    1 -
 .../source/drivers/dbase/DDatabaseMetaData.cxx     |    1 -
 connectivity/source/drivers/evoab2/NConnection.cxx |    1 -
 connectivity/source/drivers/flat/EConnection.cxx   |    1 -
 .../source/drivers/flat/EDatabaseMetaData.cxx      |    1 -
 cui/source/dialogs/about.cxx                       |    1 -
 cui/source/dialogs/hangulhanjadlg.cxx              |    1 -
 cui/source/inc/hltpbase.hxx                        |    1 -
 cui/source/options/dbregister.cxx                  |    1 -
 cui/source/options/optinet2.cxx                    |    1 -
 .../source/core/dataaccess/databasedocument.cxx    |    1 -
 dbaccess/source/filter/xml/dbloader2.cxx           |    1 -
 dbaccess/source/filter/xml/xmlfilter.cxx           |    1 -
 dbaccess/source/ui/app/AppControllerDnD.cxx        |    1 -
 dbaccess/source/ui/app/AppControllerGen.cxx        |    1 -
 dbaccess/source/ui/browser/genericcontroller.cxx   |    1 -
 dbaccess/source/ui/browser/sbagrid.cxx             |    1 -
 dbaccess/source/ui/dlg/ConnectionPage.cxx          |    1 -
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx     |    1 -
 dbaccess/source/ui/dlg/DbAdminImpl.cxx             |    1 -
 desktop/source/app/appinit.cxx                     |    1 -
 desktop/source/deployment/manager/dp_manager.cxx   |    1 -
 desktop/source/offacc/acceptor.cxx                 |    1 -
 desktop/source/splash/splash.cxx                   |    1 -
 desktop/unx/splash/unxsplash.cxx                   |    1 -
 editeng/source/misc/unolingu.cxx                   |    1 -
 extensions/source/bibliography/bibbeam.cxx         |    1 -
 extensions/source/bibliography/bibcont.cxx         |    1 -
 extensions/source/bibliography/bibload.cxx         |    1 -
 extensions/source/bibliography/bibmod.cxx          |    1 -
 extensions/source/bibliography/datman.cxx          |    1 -
 extensions/source/bibliography/toolbar.cxx         |    1 -
 extensions/source/propctrlr/browserline.cxx        |    1 -
 extensions/source/xmlextract/xmxcom.hxx            |    1 -
 filter/source/graphicfilter/ieps/ieps.cxx          |    1 -
 filter/source/svg/svgwriter.hxx                    |    1 -
 formula/source/ui/dlg/formula.cxx                  |    1 -
 fpicker/source/aqua/SalAquaFilePicker.mm           |    1 -
 fpicker/source/aqua/SalAquaFolderPicker.mm         |    1 -
 fpicker/source/aqua/SalAquaPicker.mm               |    1 -
 framework/source/services/backingcomp.cxx          |    1 -
 framework/source/services/sessionlistener.cxx      |    1 -
 framework/source/services/tabwindowservice.cxx     |    1 -
 framework/source/tabwin/tabwindow.cxx              |    1 -
 framework/source/tabwin/tabwinfactory.cxx          |    1 -
 framework/source/uiconfiguration/imagemanager.cxx  |    1 -
 .../source/uiconfiguration/moduleimagemanager.cxx  |    1 -
 .../source/uielement/buttontoolbarcontroller.cxx   |    1 -
 .../source/uielement/comboboxtoolbarcontroller.cxx |    1 -
 .../source/uielement/complextoolbarcontroller.cxx  |    1 -
 .../source/uielement/controlmenucontroller.cxx     |    1 -
 .../uielement/dropdownboxtoolbarcontroller.cxx     |    1 -
 .../source/uielement/edittoolbarcontroller.cxx     |    1 -
 .../source/uielement/footermenucontroller.cxx      |    1 -
 .../source/uielement/headermenucontroller.cxx      |    1 -
 .../uielement/imagebuttontoolbarcontroller.cxx     |    1 -
 .../uielement/langselectionmenucontroller.cxx      |    1 -
 .../source/uielement/macrosmenucontroller.cxx      |    1 -
 framework/source/uielement/menubarmanager.cxx      |    1 -
 framework/source/uielement/newmenucontroller.cxx   |    1 -
 .../source/uielement/objectmenucontroller.cxx      |    1 -
 .../uielement/spinfieldtoolbarcontroller.cxx       |    1 -
 .../uielement/togglebuttontoolbarcontroller.cxx    |    1 -
 .../source/uielement/toolbarsmenucontroller.cxx    |    1 -
 .../source/uifactory/addonstoolboxfactory.cxx      |    1 -
 framework/source/uifactory/menubarfactory.cxx      |    1 -
 framework/source/uifactory/statusbarfactory.cxx    |    1 -
 framework/source/uifactory/toolboxfactory.cxx      |    1 -
 .../source/uifactory/uielementfactorymanager.cxx   |    1 -
 .../uifactory/windowcontentfactorymanager.cxx      |    1 -
 linguistic/source/convdicxml.cxx                   |    1 -
 linguistic/source/hhconvdic.cxx                    |    1 -
 padmin/source/fontentry.hxx                        |    2 --
 padmin/source/padialog.cxx                         |    1 +
 reportdesign/source/core/api/ReportEngineJFree.cxx |    1 -
 reportdesign/source/filter/xml/dbloader2.cxx       |    1 +
 reportdesign/source/filter/xml/dbloader2.hxx       |    1 -
 reportdesign/source/filter/xml/xmlfilter.cxx       |    1 -
 reportdesign/source/ui/dlg/Formula.cxx             |    1 -
 sc/source/core/data/table2.cxx                     |    1 -
 sc/source/core/data/validat.cxx                    |    1 -
 sc/source/core/tool/interpr4.cxx                   |    1 -
 sc/source/filter/excel/excdoc.cxx                  |    1 -
 sc/source/filter/excel/excimp8.cxx                 |    1 -
 sc/source/filter/excel/namebuff.cxx                |    1 -
 sc/source/filter/xml/xmlcelli.hxx                  |    1 -
 sc/source/filter/xml/xmlimprt.cxx                  |    1 -
 sc/source/filter/xml/xmlimprt.hxx                  |    1 -
 sc/source/filter/xml/xmlwrap.cxx                   |    1 -
 sc/source/ui/drawfunc/fuins1.cxx                   |    1 -
 sc/source/ui/vba/vbawindows.cxx                    |    1 -
 sc/source/ui/view/gridwin.cxx                      |    1 -
 sd/source/core/CustomAnimationPreset.cxx           |    1 -
 sd/source/core/TransitionPreset.cxx                |    1 -
 sd/source/core/anminfo.cxx                         |    1 -
 sd/source/core/drawdoc4.cxx                        |    1 -
 sd/source/core/sdpage2.cxx                         |    1 -
 sd/source/filter/html/sdhtmlfilter.cxx             |    1 -
 sd/source/filter/xml/sdxmlwrp.cxx                  |    1 -
 sd/source/ui/app/sddll.cxx                         |    1 -
 sd/source/ui/app/sdxfer.cxx                        |    1 -
 sd/source/ui/dlg/dlgassim.cxx                      |    1 -
 sd/source/ui/dlg/filedlg.cxx                       |    1 -
 sd/source/ui/func/fuinsfil.cxx                     |    1 -
 sd/source/ui/slideshow/slideshowimpl.hxx           |    1 -
 sd/source/ui/slideshow/slideshowviewimpl.hxx       |    1 -
 .../ui/toolpanel/controls/MasterPageContainer.cxx  |    1 -
 .../toolpanel/controls/RecentlyUsedMasterPages.cxx |    1 -
 sd/source/ui/unoidl/unomodel.cxx                   |    1 -
 sd/source/ui/view/drviewsb.cxx                     |    1 -
 sd/source/ui/view/drviewsf.cxx                     |    1 -
 .../presenter/PresenterPaneBorderManager.hxx       |    1 -
 sfx2/inc/inettbc.hxx                               |    1 -
 sfx2/source/appl/app.cxx                           |    2 --
 sfx2/source/appl/appbas.cxx                        |    1 -
 sfx2/source/appl/appinit.cxx                       |    1 -
 sfx2/source/appl/appmain.cxx                       |    1 -
 sfx2/source/appl/helpdispatch.cxx                  |    1 -
 sfx2/source/bastyp/sfxresid.cxx                    |    2 --
 sfx2/source/config/evntconf.cxx                    |    1 -
 sfx2/source/doc/SfxDocumentMetaData.cxx            |    1 -
 sfx2/source/doc/docfac.cxx                         |    1 -
 sfx2/source/menu/mnumgr.cxx                        |    1 -
 sfx2/source/menu/virtmenu.cxx                      |    1 -
 starmath/source/mathmlexport.cxx                   |    1 -
 starmath/source/mathmlimport.cxx                   |    1 -
 svl/source/misc/documentlockfile.cxx               |    1 -
 svl/source/misc/sharecontrolfile.cxx               |    1 -
 svtools/source/config/miscopt.cxx                  |    1 -
 svtools/source/control/filectrl.cxx                |    1 -
 svtools/source/hatchwindow/ipwin.hxx               |    1 -
 svtools/source/misc/transfer2.cxx                  |    1 -
 svtools/source/misc/wallitem.cxx                   |    1 -
 svtools/source/svhtml/htmlout.cxx                  |    1 -
 svtools/workben/treecontrol/treetest.cxx           |    1 -
 svx/inc/svx/scene3d.hxx                            |    1 -
 svx/source/fmcomp/dbaexchange.cxx                  |    1 -
 svx/source/form/fmshimp.cxx                        |    1 -
 svx/source/form/fmview.cxx                         |    1 -
 svx/source/svdraw/svdmodel.cxx                     |    1 -
 svx/source/svdraw/svdoashp.cxx                     |    1 -
 svx/source/svdraw/svdogrp.cxx                      |    1 -
 svx/source/tbxctrls/extrusioncontrols.cxx          |    1 -
 svx/workben/edittest.cxx                           |    1 -
 sw/inc/shellio.hxx                                 |    1 -
 sw/source/core/doc/docdesc.cxx                     |    1 -
 sw/source/core/edit/editsh.cxx                     |    1 -
 sw/source/core/edit/edtox.cxx                      |    2 --
 sw/source/core/ole/ndole.cxx                       |    1 -
 sw/source/core/sw3io/swacorr.cxx                   |    1 -
 sw/source/core/unocore/unocrsrhelper.cxx           |    1 -
 sw/source/core/unocore/unoframe.cxx                |    1 -
 sw/source/core/unocore/unoobj.cxx                  |    1 -
 sw/source/core/unocore/unoobj2.cxx                 |    1 -
 sw/source/core/unocore/unostyle.cxx                |    1 -
 sw/source/filter/html/htmlatr.cxx                  |    1 -
 sw/source/filter/html/htmlforw.cxx                 |    1 -
 sw/source/filter/html/swhtml.hxx                   |    1 -
 sw/source/filter/xml/swxml.cxx                     |    1 -
 sw/source/filter/xml/wrtxml.cxx                    |    1 -
 sw/source/filter/xml/xmlfmt.cxx                    |    1 -
 sw/source/filter/xml/xmltexte.cxx                  |    1 -
 sw/source/ui/app/apphdl.cxx                        |    1 -
 sw/source/ui/app/docsh.cxx                         |    1 -
 sw/source/ui/config/optcomp.cxx                    |    1 -
 sw/source/ui/misc/num.cxx                          |    1 -
 sw/source/ui/shells/listsh.cxx                     |    1 -
 sw/source/ui/shells/mediash.cxx                    |    1 -
 sw/source/ui/shells/textfld.cxx                    |    1 -
 sw/source/ui/wrtsh/wrtsh3.cxx                      |    1 -
 toolkit/source/controls/dialogcontrol.cxx          |    1 -
 toolkit/source/controls/tabpagemodel.cxx           |    1 -
 toolkit/source/controls/unocontrol.cxx             |    2 --
 toolkit/source/controls/unocontrolmodel.cxx        |    1 -
 tools/source/rc/resmgr.cxx                         |    1 -
 unotools/source/config/cmdoptions.cxx              |    1 -
 unotools/source/config/defaultoptions.cxx          |    1 -
 unotools/source/config/eventcfg.cxx                |    1 -
 unotools/source/config/extendedsecurityoptions.cxx |    1 -
 unotools/source/config/inetoptions.cxx             |    1 -
 unotools/source/ucbhelper/xtempfile.cxx            |    1 -
 vbahelper/source/vbahelper/vbahelper.cxx           |    1 -
 vcl/inc/impgraph.hxx                               |    1 -
 vcl/inc/vcl/sound.hxx                              |    1 -
 vcl/source/gdi/gfxlink.cxx                         |    1 -
 vcl/source/window/winproc.cxx                      |    1 +
 xmloff/source/draw/shapeexport2.cxx                |    1 -
 xmloff/source/forms/propertyexport.cxx             |    1 -
 xmloff/source/forms/propertyimport.cxx             |    1 -
 xmloff/source/meta/xmlmetae.cxx                    |    2 --
 xmloff/source/style/xmlnumi.cxx                    |    1 -
 xmlsecurity/tools/demo/mozprofile.cxx              |    1 -
 199 files changed, 3 insertions(+), 202 deletions(-)

diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index f11f4c0..f0d6820 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -31,7 +31,6 @@
 
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
-#include <tools/urlobj.hxx>
 #include <avmedia/avmediadllapi.h>
 
 // -----------
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx 
b/avmedia/source/quicktime/quicktimecommon.hxx
index 1c22377..3ea131d 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -43,7 +43,6 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index c89fa53..556a599 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -35,7 +35,6 @@
 #include <algorithm>
 #include <cmath>
 #include <osl/mutex.hxx>
-#include <tools/time.hxx>
 #include <vcl/svapp.hxx>
 #ifdef UNX
 #include <vcl/sysdata.hxx>
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index 0dd7cae..c90339b 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -34,7 +34,6 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index a194029..bc850bc 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -65,7 +65,6 @@
 #include <unotools/collatorwrapper.hxx>
 
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 35789b2..80b0c72 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -29,7 +29,6 @@
 
 #include "propacc.hxx"
 
-#include <tools/urlobj.hxx>
 #include <tools/errcode.hxx>
 #include <svl/svarray.hxx>
 #include <basic/sbstar.hxx>
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx 
b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 32cb0f5..a8077f7 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
 #include <com/sun/star/sheet/XDatabaseRanges.hpp>
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
-#include <tools/urlobj.hxx>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx 
b/connectivity/source/drivers/dbase/DConnection.cxx
index fe6cd6f..cecc2dd 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -32,7 +32,6 @@
 #include "dbase/DCatalog.hxx"
 #include "dbase/DDriver.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <tools/urlobj.hxx>
 #include "dbase/DPreparedStatement.hxx"
 #include "dbase/DStatement.hxx"
 #include <tools/debug.hxx>
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx 
b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 7aecf6e..aad436e 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <tools/urlobj.hxx>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include "dbase/DIndex.hxx"
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx 
b/connectivity/source/drivers/evoab2/NConnection.cxx
index 7315193..61d5d8d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -31,7 +31,6 @@
 #include "NCatalog.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <tools/urlobj.hxx>
 #include "NPreparedStatement.hxx"
 #include "NStatement.hxx"
 #include <comphelper/extract.hxx>
diff --git a/connectivity/source/drivers/flat/EConnection.cxx 
b/connectivity/source/drivers/flat/EConnection.cxx
index 79d2459..f83fd4a 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -31,7 +31,6 @@
 #include "flat/ECatalog.hxx"
 #include "flat/EDriver.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <tools/urlobj.hxx>
 #include "flat/EPreparedStatement.hxx"
 #include "flat/EStatement.hxx"
 #include <comphelper/extract.hxx>
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx 
b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index e5ed822..f9f2411 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <tools/urlobj.hxx>
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/extract.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 250a0d2..70648a0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,7 +32,6 @@
 #include <vcl/msgbox.hxx>
 
 #include <tools/stream.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 865c05a..e518649 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -35,7 +35,6 @@
 #include "helpid.hrc"
 
 #include <algorithm>
-#include <tools/urlobj.hxx>
 #include <vcl/controllayout.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 686d561..9e8bbf57 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -36,7 +36,6 @@
 #include <vcl/combobox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svtools/transfer.hxx>
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e42385a..717d589 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -46,7 +46,6 @@
 #include <svtools/svtabbx.hxx>
 #include <svl/itemset.hxx>
 #include "doclinkdialog.hxx"
-#include <tools/urlobj.hxx>
 #include <unotools/localfilehelper.hxx>
 #include "optHeaderTabListbox.hxx"
 #include <sfx2/docfilt.hxx>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 5d1b394..e0c7c7a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -49,7 +49,6 @@
 #include <unotools/bootstrap.hxx>
 #include <vcl/help.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/securityoptions.hxx>
 #include <unotools/localfilehelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5f6a40d..5b525ff 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -91,7 +91,6 @@
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <tools/errcode.hxx>
-#include <tools/urlobj.hxx>
 
 #include <boost/bind.hpp>
 
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index e03e9c0..1e5aa44 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -75,7 +75,6 @@
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 84ef50d..dfa7eb1 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/uno/XNamingService.hpp>
 #include "xmlDatabase.hxx"
 #include "xmlEnums.hxx"
-#include <tools/urlobj.hxx>
 #include "xmlstrings.hrc"
 #include <xmloff/DocumentSettingsContext.hxx>
 #include "xmlStyleImport.hxx"
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx 
b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 6e8653f..d81d388 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
-#include <tools/urlobj.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "dlgsave.hxx"
 #include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx 
b/dbaccess/source/ui/app/AppControllerGen.cxx
index ef40f0f..da6fa2b 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -74,7 +74,6 @@
 #include <toolkit/unohlp.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index fe8f4e7..da54960 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -52,7 +52,6 @@
 
 #include <sal/macros.h>
 #include <vcl/waitobj.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/urihelper.hxx>
 #include "datasourceconnector.hxx"
 #include <unotools/moduleoptions.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 9d3a539..7ba5def 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -62,7 +62,6 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 06e3495..84fd116 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -65,7 +65,6 @@
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
 #include <connectivity/CommonTools.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/docfilt.hxx>
 #include "dsnItem.hxx"
 #if defined(WNT)
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx 
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index b23f4c2..e392b87 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -62,7 +62,6 @@
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
 #include <connectivity/CommonTools.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/docfilt.hxx>
 #include <vcl/mnemonic.hxx>
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a38c26ee..d0b97e0 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -72,7 +72,6 @@
 #include <svl/itempool.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <typelib/typedescription.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index ab6fdf9..6de527e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -58,7 +58,6 @@
 #include <ucbhelper/configurationkeys.hxx>
 
 #include <cppuhelper/bootstrap.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/rcid.h>
 
 #include <rtl/logfile.hxx>
diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index d2a6550..4f6f6c04 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -61,7 +61,6 @@
 #include "com/sun/star/task/XInteractionApprove.hpp"
 #include "com/sun/star/ucb/UnsupportedCommandException.hpp"
 #include "boost/bind.hpp"
-#include "tools/urlobj.hxx"
 #include "unotools/tempfile.hxx"
 
 #include "osl/file.hxx"
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index caa0564..4ebc355 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -29,7 +29,6 @@
 
 #include "acceptor.hxx"
 #include <unotools/bootstrap.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index c27923e..8773f1a 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -30,7 +30,6 @@
 #include "splash.hxx"
 #include <stdio.h>
 #include <unotools/bootstrap.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
 #include <sfx2/sfx.hrc>
 #include <vcl/svapp.hxx>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index bda0185..e7c7bd5 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <unotools/bootstrap.hxx>
 #include <osl/process.h>
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
 #include <sfx2/sfx.hrc>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index d95a54b..8106dad 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -33,7 +33,6 @@
 #include <list>
 #include <memory>
 #include <editeng/unolingu.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index e5fba9c..9458497 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index afa868f..bc29e60 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -28,7 +28,6 @@
 
 
 #include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
 #include <cppuhelper/weak.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 42b9aa0..882b9a2 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -29,7 +29,6 @@
 
 
 #include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
 #include <svl/itemprop.hxx>
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 1cf6932..03719c6 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -29,7 +29,6 @@
 
 
 #include <tools/resmgr.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/urihelper.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5958ba6..6fe89fe 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -28,7 +28,6 @@
 
 #include <osl/mutex.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ba1cb90..4b1e32c 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 #include <comphelper/processfactory.hxx>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
diff --git a/extensions/source/propctrlr/browserline.cxx 
b/extensions/source/propctrlr/browserline.cxx
index 7eef06c..480ac6b 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/urlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx
index fd8690f..515a0e2 100644
--- a/extensions/source/xmlextract/xmxcom.hxx
+++ b/extensions/source/xmlextract/xmxcom.hxx
@@ -34,7 +34,6 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/uno/Reference.h>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index f9aa999..6fd4dd7 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -45,7 +45,6 @@
 #include <vcl/cvtgrf.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svtools/fltcall.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/tempfile.hxx>
 #include <osl/process.h>
 #include <osl/file.hxx>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index b4fe4ae..d06c8b3 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -35,7 +35,6 @@
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 4197ae4..d34e86f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -47,7 +47,6 @@
 #include <svl/eitem.hxx>
 
 #include <unotools/charclass.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 
 #include "formdlgs.hrc"
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 2788da4..2d80b30 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -44,7 +44,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include <tools/urlobj.hxx>
 #include "resourceprovider.hxx"
 
 #include <tools/rc.hxx>
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 7f269ec..838f9e3 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -45,7 +45,6 @@
 #include <vcl/svapp.hxx>
 #include "SalAquaFolderPicker.hxx"
 
-#include <tools/urlobj.hxx>
 #include <iostream>
 
 #include "resourceprovider.hxx"
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 07534a2..a00eb4e 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -39,7 +39,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include "SalAquaPicker.hxx"
-#include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include "CFStringUtilities.hxx"
 #include "NSString_OOoAdditions.hxx"
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 598358e..19d62d2 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -63,7 +63,6 @@
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <svl/solar.hrc>
diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index 134471a..524a14c 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -39,7 +39,6 @@
 
 
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/framework/source/services/tabwindowservice.cxx 
b/framework/source/services/tabwindowservice.cxx
index 8a43b89..8b021cd 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -49,7 +49,6 @@
 
//_________________________________________________________________________________________________________________
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 9d38c70..d496c09 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -46,7 +46,6 @@
 //  includes of other projects
 
//_________________________________________________________________________________________________________________
 #include <rtl/ustrbuf.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 344128d..704fc2c 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -46,7 +46,6 @@
 //  includes of other projects
 
//_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uiconfiguration/imagemanager.cxx 
b/framework/source/uiconfiguration/imagemanager.cxx
index d85e8ef..fcb768f 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -56,7 +56,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx 
b/framework/source/uiconfiguration/moduleimagemanager.cxx
index c43ce27..390ba4d 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -61,7 +61,6 @@
 #include <osl/mutex.hxx>
 #include <osl/file.hxx>
 #include <comphelper/sequence.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx 
b/framework/source/uielement/buttontoolbarcontroller.cxx
index 4f8c655..1a1613f 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -54,7 +54,6 @@
 #include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/window.hxx>
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx 
b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 38879eb..32658f3 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -56,7 +56,6 @@
 #include <vcl/mnemonic.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/combobox.hxx>
-#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx 
b/framework/source/uielement/complextoolbarcontroller.cxx
index a70dd5a..a9ba6c5 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -54,7 +54,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/controlmenucontroller.cxx 
b/framework/source/uielement/controlmenucontroller.cxx
index a946858..b7987d3 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -53,7 +53,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 #include <svl/solar.hrc>
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx 
b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index bf6896d..1b2f2f3 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -53,7 +53,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx 
b/framework/source/uielement/edittoolbarcontroller.cxx
index 9bf3c71..0afdab7 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -53,7 +53,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/footermenucontroller.cxx 
b/framework/source/uielement/footermenucontroller.cxx
index 6b6926b..e2938c9 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -55,7 +55,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/headermenucontroller.cxx 
b/framework/source/uielement/headermenucontroller.cxx
index 3c1e1b4..103e155 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -55,7 +55,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx 
b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 92719b5..55f82dc 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -54,7 +54,6 @@
 #include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/window.hxx>
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx 
b/framework/source/uielement/langselectionmenucontroller.cxx
index 2e24332..fb7c59a 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -50,7 +50,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/mnemonic.hxx>
 #include <com/sun/star/awt/XMenuExtended.hpp>
diff --git a/framework/source/uielement/macrosmenucontroller.cxx 
b/framework/source/uielement/macrosmenucontroller.cxx
index 568383d..b954bce 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -43,7 +43,6 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "helper/mischelper.hxx"
 #include "helpid.hrc"
diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 4de7ea4..64e86f9 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -81,7 +81,6 @@
 #include <unotools/cmdoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <toolkit/unohlp.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>
diff --git a/framework/source/uielement/newmenucontroller.cxx 
b/framework/source/uielement/newmenucontroller.cxx
index 3fc4a5a..d273196 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -56,7 +56,6 @@
 
//_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
diff --git a/framework/source/uielement/objectmenucontroller.cxx 
b/framework/source/uielement/objectmenucontroller.cxx
index df8707b..ad69cb5 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -51,7 +51,6 @@
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx 
b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 6245d01..2560270 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -56,7 +56,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
 #ifdef WINNT
 #include <systools/win32/snprintf.h>
 #endif
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx 
b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index a4324e7..e102918 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -54,7 +54,6 @@
 #include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/window.hxx>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx 
b/framework/source/uielement/toolbarsmenucontroller.cxx
index ecc6a9b..6cc561a 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -64,7 +64,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/i18nhelp.hxx>
 #include <vcl/image.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <toolkit/unohlp.hxx>
 #include <vcl/window.hxx>
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx 
b/framework/source/uifactory/addonstoolboxfactory.cxx
index aa024d5..2516de5 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -49,7 +49,6 @@
 //  includes of other projects
 
//_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uifactory/menubarfactory.cxx 
b/framework/source/uifactory/menubarfactory.cxx
index 7e2de9c..5558166 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -52,7 +52,6 @@
 
 #include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/framework/source/uifactory/statusbarfactory.cxx 
b/framework/source/uifactory/statusbarfactory.cxx
index 2560475..5c56ae5 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -50,7 +50,6 @@
 //  includes of other projects
 
//_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uifactory/toolboxfactory.cxx 
b/framework/source/uifactory/toolboxfactory.cxx
index 6858370..9d3a19e 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -49,7 +49,6 @@
 //  includes of other projects
 
//_________________________________________________________________________________________________________________
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx 
b/framework/source/uifactory/uielementfactorymanager.cxx
index a673ba6..b8d31e3 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -52,7 +52,6 @@
 
//_________________________________________________________________________________________________________________
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/weak.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/logfile.hxx>
 
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx 
b/framework/source/uifactory/windowcontentfactorymanager.cxx
index f9a841d..9838427 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -53,7 +53,6 @@
 
//_________________________________________________________________________________________________________________
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/weak.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 
 
//_________________________________________________________________________________________________________________
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 90c1782..4cda05e 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/string.hxx>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 3923aee..e73fa1e 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -28,7 +28,6 @@
 
 #include <unicode/uscript.h>
 #include <i18npool/lang.h>
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
diff --git a/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx
index 262134a..88d05d9 100644
--- a/padmin/source/fontentry.hxx
+++ b/padmin/source/fontentry.hxx
@@ -40,8 +40,6 @@
 #include "vcl/group.hxx"
 #include "vcl/fontmanager.hxx"
 
-#include "tools/urlobj.hxx"
-
 namespace padmin {
 
     class FontImportDialog :
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 1aeab2c..ee3a815 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -50,6 +50,7 @@
 
 #include "tools/stream.hxx"
 #include "tools/color.hxx"
+#include "tools/urlobj.hxx"
 
 #include "osl/file.hxx"
 
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx 
b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 87d9982..e7e049b 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/task/XJob.hpp>
 
 #include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/sharedunocomponent.hxx>
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx 
b/reportdesign/source/filter/xml/dbloader2.cxx
index 9e05065..e1de0d5 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -26,6 +26,7 @@
  *
  ************************************************************************/
 #include "dbloader2.hxx"
+#include <tools/urlobj.hxx>
 #include <comphelper/sequence.hxx>
 // -------------------------------------------------------------------------
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx 
b/reportdesign/source/filter/xml/dbloader2.hxx
index b58309e..404a24e 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -30,7 +30,6 @@
 #define RPTXML_DBLOADER2_HXX
 
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/urlobj.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index e08ef57..35d9f08 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -53,7 +53,6 @@
 #include <sfx2/docfile.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
-#include <tools/urlobj.hxx>
 #include <xmloff/DocumentSettingsContext.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlmetai.hxx>
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 3b4f7ee..6ece91b 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -35,7 +35,6 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/viewoptions.hxx>
-#include <tools/urlobj.hxx>
 #include <formula/formdata.hxx>
 #include <formula/funcutl.hxx>
 #include <formula/tokenarray.hxx>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index d070bf7..853785b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -31,7 +31,6 @@
 
 #include "scitems.hxx"
 #include <editeng/boxitem.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/poolcach.hxx>
 #include <unotools/charclass.hxx>
 #include <math.h>
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index addb76b..1f8f85f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -43,7 +43,6 @@
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/math.hxx>
 
 #include "validat.hxx"
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c399205..429150e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -41,7 +41,6 @@
 #include <basic/sbuno.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zforlist.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 1ee9503..d427350 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -42,7 +42,6 @@
 #include <svl/zformat.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/objsh.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustring.hxx>
 
 #include "cell.hxx"
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 4671c08..ef09d2b 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -67,7 +67,6 @@
 #include <svl/stritem.hxx>
 
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/math.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 3319b26..f9e7738 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -29,7 +29,6 @@
 
 #include "namebuff.hxx"
 
-#include <tools/urlobj.hxx>
 #include <string.h>
 
 #include "rangenam.hxx"
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 99d6ddb..7a518ea 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -34,7 +34,6 @@
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/table/XCell.hpp>
-#include <tools/time.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/table/CellRangeAddress.hpp>
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 570bb7f..10259c4 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -87,7 +87,6 @@
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/sheet/XNamedRanges.hpp>
 #include <com/sun/star/sheet/NamedRangeFlag.hpp>
 #include <com/sun/star/sheet/XNamedRange.hpp>
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index a90500b..8df2f77 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -36,7 +36,6 @@
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include <com/sun/star/frame/XModel.hpp>
-#include <tools/time.hxx>
 #include <com/sun/star/util/DateTime.hpp>
 #include "xmlsubti.hxx"
 #include "global.hxx"
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 33dd8ee..c9819f6 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -40,7 +40,6 @@
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/xml/sax/XErrorHandler.hpp>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 10b6661..22671a4 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -38,7 +38,6 @@
 #include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <vcl/msgbox.hxx>
-#include <tools/urlobj.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index fac4e6f..d13a033 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <cppuhelper/implbase3.hxx>
 
-#include <tools/urlobj.hxx>
 #include "vbawindow.hxx"
 #include "vbaglobals.hxx"
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2c4e5a7..948d433 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -46,7 +46,6 @@
 #include <svtools/svlbox.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svl/urlbmk.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/graph.hxx>
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index feab133..5fc1ea2 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index e8bfab4..f290802 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 01756fd..e3f864b 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <tools/urlobj.hxx>
 #include <svl/smplhint.hxx>
 #include "svx/xtable.hxx"
 #include <svx/svdopath.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 6780235..232f65c 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-#include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/dispatch.hxx>
 #include "Outliner.hxx"
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 2b17dd1..0159b14 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -35,7 +35,6 @@
 #include <editeng/outliner.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <svx/svdotext.hxx>
-#include <tools/urlobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/xmlcnitm.hxx>
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index b1c57e9..74dd7c4 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -29,7 +29,6 @@
 
 #include <unotools/localfilehelper.hxx>
 #include <tools/errinf.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 674ab9c..2f490ed8 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -35,7 +35,6 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
-#include <tools/urlobj.hxx>
 #include "drawdoc.hxx"
 #include <unotools/streamwrap.hxx>
 #include <svx/xmlgrhlp.hxx>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 6980735..094bbcb 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -48,7 +48,6 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <tools/urlobj.hxx>
 #include <svtools/FilterConfigItem.hxx>
 #include <com/sun/star/util/XArchiver.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 317c9f2..fe56d11 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -47,7 +47,6 @@
 #include <editeng/editobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
-#include <tools/urlobj.hxx>
 #include <sot/formats.hxx>
 #include <svl/urlbmk.hxx>
 #include <editeng/outliner.hxx>
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index db0cebb..f1d37f6 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -31,7 +31,6 @@
 #undef SD_DLLIMPLEMENTATION
 #endif
 #include <sfx2/docfile.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 
 #include "sdpage.hxx"
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index db0c970..5cf6e9e 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <vcl/msgbox.hxx>
 #include <sal/types.h>
-#include <tools/urlobj.hxx>
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index a54e227..37bd374 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -44,7 +44,6 @@
 #include <sot/formats.hxx>
 #include <svl/urihelper.hxx>
 #include <editeng/forbiddencharacterstable.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 612d91b..f84553a 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -59,7 +59,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tools/canvastools.hxx>
 #include <vcl/help.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx 
b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 8028d99..1a6ce65 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -53,7 +53,6 @@
 #include <basegfx/tools/canvastools.hxx>
 #include <cppcanvas/spritecanvas.hxx>
 #include <vcl/help.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx 
b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 7c6511c..fcc71cc 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <comphelper/processfactory.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdpage.hxx>
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx 
b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index e0587e8..5722edd 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
-#include <tools/urlobj.hxx>
 #include <unotools/confignode.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 6dfb029..16ab6f2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -100,7 +100,6 @@
 #include <com/sun/star/presentation/AnimationEffect.hpp>
 #include <com/sun/star/presentation/AnimationSpeed.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
-#include <tools/urlobj.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 27ba354..231c6d5 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -33,7 +33,6 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/hlnkitem.hxx>
-#include <tools/urlobj.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 012163c..6c7af31 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -48,7 +48,6 @@
 #include <svx/svddef.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/svdouno.hxx>
-#include <tools/urlobj.hxx>
 #include <svx/fmshell.hxx>
 #include <svl/cjkoptions.hxx>
 
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx 
b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index b9b25f3..db7002c 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <rtl/ref.hxx>
-#include <tools/svborder.hxx>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index abc2e55..df0241d 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -31,7 +31,6 @@
 
 // includes *****************************************************************
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 
 #include <vcl/combobox.hxx>
 #include <svtools/acceleratorexecute.hxx>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index c4200c4..d3f134d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -35,7 +35,6 @@
 
 #include <sfx2/app.hxx>
 #include <sfx2/frame.hxx>
-#include <tools/simplerm.hxx>
 #include <basic/basrdll.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
@@ -49,7 +48,6 @@
 #include <svtools/ehdl.hxx>
 
 #include <svl/svdde.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
 
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 2882e76..1f28ec8 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -31,7 +31,6 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <basic/basrdll.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/macitem.hxx>
 #include <basic/sbxfac.hxx>
 #include <basic/sbx.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 8440355..8f48fd3 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -38,7 +38,6 @@
 #include <unotools/saveopt.hxx>
 #include <unotools/localisationoptions.hxx>
 #include <tools/resary.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index f59905b..3a16624 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -30,7 +30,6 @@
 #define _SDINTERN_HXX
 
 #include <stdio.h>
-#include <tools/urlobj.hxx>
 #include <svtools/ehdl.hxx>
 #include <unotools/startoptions.hxx>
 #include <svl/itempool.hxx>
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index 7f7cd76..b21e5f1 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -31,7 +31,6 @@
 #include <sfx2/sfxuno.hxx>
 #include "newhelp.hxx"
 #include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
 
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 37696a6..8ca9604 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/simplerm.hxx>
-
 #include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 4a14082..575ea4b 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -34,7 +34,6 @@
 #include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
-#include <tools/urlobj.hxx>
 #include <basic/sbx.hxx>
 #include <sot/storage.hxx>
 #include <unotools/securityoptions.hxx>
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index a46318d..8f029ee 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -69,7 +69,6 @@
 #include "tools/debug.hxx"
 #include "tools/string.hxx" // for DBG
 #include "tools/datetime.hxx"
-#include "tools/urlobj.hxx"
 #include "osl/mutex.hxx"
 #include "cppuhelper/basemutex.hxx"
 #include "cppuhelper/interfacecontainer.hxx"
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index e1aa2e5..4fe3e04 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -36,7 +36,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 27baca0..f5c7a3c 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -47,7 +47,6 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/lingucfg.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 0645470..93b1b81 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/unohlp.hxx>
-#include <tools/urlobj.hxx>
 
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 8c456e4..6f449d1 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -56,7 +56,6 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
 #include <osl/diagnose.h>
-#include <tools/urlobj.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/stritem.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 4a7e1b7..de00ebb 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -55,7 +55,6 @@ one go*/
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
 #include <osl/diagnose.h>
-#include <tools/urlobj.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/saveopt.hxx>
 #include <svl/stritem.hxx>
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index e2a8e8d..e01dd09 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -46,7 +46,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 
 #include <ucbhelper/content.hxx>
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 546adb8..45b4578 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -48,7 +48,6 @@
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 42a0c0d..c1d418b 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/link.hxx>
 #include <tools/wldcrd.hxx>
-#include <tools/urlobj.hxx>
 
 #include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 15c0d7f..9372cd8 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -28,7 +28,6 @@
 
 
 #define _SV_FIELCTRL_CXX
-#include <tools/urlobj.hxx>
 #include <svtools/svtdata.hxx>
 #include <svtools/filectrl.hxx>
 #include <filectrl.hrc>
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index c5331a9..2ad2da1 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -31,7 +31,6 @@
 
 #include <tools/gen.hxx>
 #include <vcl/window.hxx>
-#include <tools/svborder.hxx>
 
 /********************** SvResizeHelper ***********************************
 *************************************************************************/
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index c3910ed..7fd0569b 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -28,7 +28,6 @@
 
 #include <osl/mutex.hxx>
 #include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/exchange.hxx>
 #include <sot/storage.hxx>
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index b2824fd..294b002 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.cxx
@@ -37,7 +37,6 @@
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
 
 #include <vcl/graph.hxx>
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 97772cd..5a25a21 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -27,7 +27,6 @@
  ************************************************************************/
 
 
-#include <tools/urlobj.hxx>
 #include <svl/zformat.hxx>
 #include <svl/macitem.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index 419094f..4a9be57 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
 
-#include <tools/urlobj.hxx>
 #include <vcl/image.hxx>
 #include <vcl/graph.hxx>
 
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 99b125c..0a0d5af 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -31,7 +31,6 @@
 
 #include <svx/camera3d.hxx>
 #include <tools/b3dtrans.hxx>
-#include <tools/time.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/obj3d.hxx>
 
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index e5724ca..cc40926 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -38,7 +38,6 @@
 #include <sot/exchange.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include "fmprop.hrc"
-#include <tools/urlobj.hxx>
 
 //........................................................................
 namespace svx
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 9dcd4e1..4c76fb4 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -106,7 +106,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/shl.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <osl/mutex.hxx>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 798cfbb..9abf1cc 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -69,7 +69,6 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <vcl/svapp.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/stdtext.hxx>
 #include <svx/fmglob.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 1fd6026..152fdf5 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -40,7 +40,6 @@
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 
-#include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 
 #include <tools/string.hxx>
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index f8df28b..33a0c47 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -33,7 +33,6 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/datetime.hxx>
 #include <sfx2/lnkbase.hxx>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index bc0f7c7..d693d8b 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdogrp.hxx>
 
 #include <sfx2/lnkbase.hxx>
-#include <tools/urlobj.hxx>
 
 #include <svl/urihelper.hxx>
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 5ac49b1..0cb08b1 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -45,7 +45,6 @@
 #include <vcl/settings.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/colritem.hxx>
-#include <tools/urlobj.hxx>
 
 #include <svx/dialogs.hrc>
 #include <svx/svdtrans.hxx>
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 79f6eda..619af8b 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -34,7 +34,6 @@
 #include <editeng/editstat.hxx>
 #include <eerdll.hxx>
 #include <editeng/flditem.hxx>
-#include <tools/urlobj.hxx>
 #include <svx/svxacorr.hxx>
 #include <tools/fsys.hxx>
 #include <svx/xpoly.hxx>
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 56cd063..5ea3285 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -43,7 +43,6 @@
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
 #include <tools/ref.hxx>
-#include <tools/urlobj.hxx>
 #include <swdllapi.h>
 #include <swtypes.hxx>
 #include <docfac.hxx>   // SwDocFac
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 2284b72..dea6c0c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -34,7 +34,6 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/paperinf.hxx>
 #include "editeng/frmdiritem.hxx"
-#include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/printer.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index de33e7e..038c26e 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -28,7 +28,6 @@
 
 
 #include <hintids.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/cmdevt.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index ba104fc..6ce4b44 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -31,8 +31,6 @@
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 
-#include <tools/urlobj.hxx>
-
 #include <svl/fstathelper.hxx>
 
 #include <svtools/txtcmp.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index c49a2f6..575d959 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -41,7 +41,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <hintids.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/linkmgr.hxx>
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 4e894f3..00af824 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -28,7 +28,6 @@
 
 
 
-#include <tools/urlobj.hxx>
 #include <swacorr.hxx>
 #include <swblocks.hxx>
 #include "SwXMLTextBlocks.hxx"
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index a44c146..92fd642 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -60,7 +60,6 @@
 #include <cntfrm.hxx>
 #include <pagefrm.hxx>
 #include <svl/eitem.hxx>
-#include <tools/urlobj.hxx>
 #include <docary.hxx>
 #include <swtable.hxx>
 #include <tox.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 2091ac6..eee968b 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -110,7 +110,6 @@
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <tools/urlobj.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <fmtfollowtextflow.hxx>
 #include <fmtwrapinfluenceonobjpos.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 37e7319..604a5dd 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -52,7 +52,6 @@
 #include <sfx2/linkmgr.hxx>
 #include <docary.hxx>
 #include <paratr.hxx>
-#include <tools/urlobj.hxx>
 #include <pam.hxx>
 #include <tools/cachestr.hxx>
 #include <shellio.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 63a7103..5f3adcb 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -47,7 +47,6 @@
 #include <sfx2/linkmgr.hxx>
 #include <docary.hxx>
 #include <paratr.hxx>
-#include <tools/urlobj.hxx>
 #include <pam.hxx>
 #include <tools/cachestr.hxx>
 #include <shellio.hxx>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index b0f7269..5b924bf 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -61,7 +61,6 @@
 #include <unotextbodyhf.hxx>
 #include <fmthdft.hxx>
 #include <fmtpdsc.hxx>
-#include <tools/urlobj.hxx>
 #include <poolfmt.hrc>
 #include <poolfmt.hxx>
 #include "unoevent.hxx"
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 08d8e9c..705821e 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/sfx.hrc>
 #if !defined _SVSTDARR_XUB_STRLEN_DECL || !defined _SVSTDARR_USHORTS_DECL
 #define _SVSTDARR_XUB_STRLEN
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 9f54c2e..9512f4d 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -43,7 +43,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svl/macitem.hxx>
-#include <tools/urlobj.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 18cdd98..45b8b7d 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -38,7 +38,6 @@
 #endif
 #include <svl/svstdarr.hxx>
 #endif
-#include <tools/urlobj.hxx>
 #include <sfx2/sfxhtml.hxx>
 #include <svl/macitem.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index b6684bd..be09f97 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -32,7 +32,6 @@
 
 #define _SVSTDARR_STRINGS
 #include <rsc/rscsfx.hxx>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index aa96b3c..259f9de 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -43,7 +43,6 @@
 #include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
 #include <unotools/saveopt.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index d9fb2d2..9b6d281 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -29,7 +29,6 @@
 
 
 #include <rtl/ustrbuf.hxx>
-#include <tools/urlobj.hxx>
 
 #ifndef _SVSTDARR_STRINGSSORT_DECL
 #define _SVSTDARR_STRINGSSORT
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index c49ec0d..545d24e 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -50,7 +50,6 @@
 #include <ndgrf.hxx>
 #include "xmlexp.hxx"
 #include "xmltexte.hxx"
-#include <tools/urlobj.hxx>
 #include <SwAppletImpl.hxx>
 
 #define _SVSTDARR_ULONGS
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 94ed76a..63cb333 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -28,7 +28,6 @@
 
 
 #include <hintids.hxx>
-#include <tools/urlobj.hxx>
 
 #include <osl/diagnose.h>
 #include <tools/link.hxx>
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index bf2487d..bb6adec 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -33,7 +33,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/jobset.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/eitem.hxx>
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index a8f29c0..6261904 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -41,7 +41,6 @@
 
 #include "optcomp.hrc"
 #include "globals.hrc"
-#include <tools/urlobj.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 832837c..6b1b558 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -37,7 +37,6 @@
 #include <hintids.hxx>
 
 #include <vcl/msgbox.hxx>
-#include <tools/urlobj.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <svx/gallery.hxx>
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 71f49de..a266706 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -38,7 +38,6 @@
 #include <sfx2/bindings.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
-#include <tools/urlobj.hxx>
 #include <svl/whiter.hxx>
 #include <svl/intitem.hxx>
 #include <tools/shl.hxx>
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index be98edf..9321c5d 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -30,7 +30,6 @@
 
 #include <cmdid.h>
 #include <hintids.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index bedc309..228d8dd 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -32,7 +32,6 @@
 
 #include <sfx2/lnkbase.hxx>
 #include <fmtfld.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/itempool.hxx>
 #include <unotools/useroptions.hxx>
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index e5f4007..077cd98 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svx/htmlmode.hxx>
-#include <tools/urlobj.hxx>
 #include "wrtsh.hxx"
 #include "view.hxx"
 #include "IMark.hxx"
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 60659f1..f152ff7 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -55,7 +55,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <algorithm>
 #include <functional>
-#include "tools/urlobj.hxx"
 #include "osl/file.hxx"
 
 #include <vcl/tabctrl.hxx>
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 282c8e9..55d9a6d 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -55,7 +55,6 @@
 #include <map>
 #include <algorithm>
 #include <functional>
-#include "tools/urlobj.hxx"
 #include "osl/file.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 8fdf384..e5bb98f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -42,8 +42,6 @@
 #include <tools/string.hxx>
 #include <tools/table.hxx>
 #include <tools/date.hxx>
-#include <tools/time.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
diff --git a/toolkit/source/controls/unocontrolmodel.cxx 
b/toolkit/source/controls/unocontrolmodel.cxx
index 4a898bf..2993b6a 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -47,7 +47,6 @@
 #include <tools/table.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 647b738..5bc5d2c 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -45,7 +45,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/bootstrap.hxx>
 #include <i18npool/mslangid.hxx>
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index e17672b..5a2bf0a 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index b8d9c33..c7b1a82 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -33,7 +33,6 @@
 #include <unotools/configmgr.hxx>
 #include <tools/debug.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/urlobj.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/mutex.hxx>
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 1ee3923..ba15664 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -37,7 +37,6 @@
 #include <cppuhelper/weakref.hxx>
 
 #include <boost/unordered_map.hpp>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <itemholder1.hxx>
diff --git a/unotools/source/config/extendedsecurityoptions.cxx 
b/unotools/source/config/extendedsecurityoptions.cxx
index 13cec84..3d51cda 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -32,7 +32,6 @@
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/wldcrd.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 0e76624..4ed1408 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -28,7 +28,6 @@
 
 #include <unotools/inetoptions.hxx>
 #include "rtl/instance.hxx"
-#include <tools/urlobj.hxx>
 #include <tools/wldcrd.hxx>
 
 #include <algorithm>
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 8b5eb38..a34017a 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -31,7 +31,6 @@
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
 #include <unotools/configmgr.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 
 namespace css = com::sun::star;
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index adc1d63..f8e1cfe 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -68,7 +68,6 @@
 #include <rtl/math.hxx>
 #include <sfx2/viewsh.hxx>
 #include <math.h>
-#include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 9b029f5..359b999 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -29,7 +29,6 @@
 #ifndef _SV_IMPGRAPH_HXX
 #define _SV_IMPGRAPH_HXX
 
-#include <tools/urlobj.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index 1a32a27..a4c2a3d 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.hxx
@@ -33,7 +33,6 @@
 #include <vcl/sndstyle.hxx>
 #include <tools/string.hxx>
 #include <tools/link.hxx>
-#include <tools/time.hxx>
 
 class Window;
 class Timer;
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 7c29092..dcfb571 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -29,7 +29,6 @@
 
 #include <osl/file.h>
 #include <tools/vcompat.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 4386614..a306fa5 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -28,6 +28,7 @@
 
 
 #include <tools/debug.hxx>
+#include <tools/time.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 91c72c3..1469bde 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -50,7 +50,6 @@
 #include <xmloff/shapeexport.hxx>
 #include "sdpropls.hxx"
 #include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 7088fb7..e01220a 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -47,7 +47,6 @@
 #include "callbacks.hxx"
 #include <unotools/datetime.hxx>
 #include <tools/date.hxx>
-#include <tools/time.hxx>
 #include <tools/datetime.hxx>
 
 //.........................................................................
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 6084916..8d87346 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -39,7 +39,6 @@
 #include "callbacks.hxx"
 #include "xmloff/xmlnmspe.hxx"
 #include <tools/date.hxx>
-#include <tools/time.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/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index a137bd6..d7fdbf3 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -30,8 +30,6 @@
 #include <tools/debug.hxx>
 #include <tools/inetdef.hxx>
 #include <i18npool/mslangid.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/time.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <xmloff/xmlmetae.hxx>
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 53e3d4f..10a08f4 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -42,7 +42,6 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/fontenum.hxx>
 
diff --git a/xmlsecurity/tools/demo/mozprofile.cxx b/xmlsecurity/tools/demo/mozprofile.cxx
index a94bfc3..ecb437d 100644
--- a/xmlsecurity/tools/demo/mozprofile.cxx
+++ b/xmlsecurity/tools/demo/mozprofile.cxx
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 #include <tools/date.hxx>
-#include <tools/time.hxx>
 #include <cppuhelper/servicefactory.hxx>
 
 #include <xmlsecurity/biginteger.hxx>

Context

[Libreoffice] [PATCH 2/5] Removed unnecessary tools includes. · Marcel Metz

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.