#i103496#: split svtools; improve ConfitItems

80 files changed, 140 insertions, 138 deletions

diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 847c8ad2f0af..5f264b388fda 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -32,7 +32,7 @@
 #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/textdata.hxx>
 #include <svtools/texteng.hxx>
 #include <svtools/textview.hxx>
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 2a7b702e38cb..3804ad3048e5 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -31,7 +31,7 @@
 #ifndef _COMMUNI_HXX
 #define _COMMUNI_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vos/thread.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/timer.hxx>
diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx
index 0ab2b48d3579..55048d05cbb0 100644
--- a/automation/source/miniapp/testapp.hxx
+++ b/automation/source/miniapp/testapp.hxx
@@ -58,7 +58,7 @@
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 
 #include "editwin.hxx"
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index 8888a007918c..a8abce528746 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -30,9 +30,9 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_automation.hxx"
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include "scmdstrm.hxx"
 #include "svcommstream.hxx"
 #include "rcontrol.hxx"
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 988f4055a2eb..890e6ace540d 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -55,7 +55,7 @@
 #if 1
 #include <svtools/ttprops.hxx>
 #include <basic/ttstrhlp.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <vcl/sound.hxx>
 #include "testtool.hrc"
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 4219d1d5b099..2816d18285d3 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -85,7 +85,7 @@
 #include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/extensionlistbox.hxx>
 // Hat keinen Includeschutz
 #include <svtools/svtdata.hxx>
@@ -102,14 +102,14 @@
 //#include <vcl/drag.hxx>
 #endif
 #include <tools/fsys.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/ttprops.hxx>
 #ifndef _BASIC_TTRESHLP_HXX
 #include <basic/ttstrhlp.hxx>
 #endif
 #include <basic/dispdefs.hxx>
 #include <vos/socket.hxx>
-#include <svtools/pickerhistory.hxx>
+#include <svl/pickerhistory.hxx>
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <sot/storage.hxx>
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index e068530459a8..1e2ae5a63f1e 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::devtools;
 #include <vcl/svapp.hxx>
 #endif
 #include <svtools/stringtransfer.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 //#ifndef _SBXCLASS_HXX //autogen
 #include <basic/sbx.hxx>
 //#endif
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4863f1fd428c..f31d397a7a00 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -30,7 +30,7 @@
 
 #include <automation/communi.hxx>
 #include <tools/link.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include <vos/thread.hxx>
 
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0ff13c806a07..00356d2bc5c4 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index e975d6464194..be1612ea7429 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -77,19 +77,19 @@
 #include "vcl/svapp.hxx"
 #include "vcl/scrbar.hxx"
 
-#include "svtools/svarray.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/svarray.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/whiter.hxx"
 #include "svtools/langtab.hxx"
 #include "svtools/texteng.hxx"
 #include "svtools/textview.hxx"
 #include "svtools/xtextedt.hxx"
 #include "svtools/txtattr.hxx"
 #include "svtools/textwindowpeer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 
 #define _BASIC_TEXTPORTIONS
 #include "basic/sbdef.hxx"
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index e21a0c9d09c6..25f47c980c5d 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -32,7 +32,7 @@
 #define _BASICBOX_HXX
 
 #include "doceventnotifier.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svheader.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index e9c6761b9e50..e23cd68a75af 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1430,7 +1430,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
     m_aSyntaxColors[TT_UNKNOWN] = aColor;
     m_aSyntaxColors[TT_WHITESPACE] = aColor;
     m_aSyntaxColors[TT_EOL] = aColor;
-    StartListening(m_aColorConfig);
+    m_aColorConfig.AddListener(this);
     m_aSyntaxColors[TT_IDENTIFIER]
         = Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor);
     m_aSyntaxColors[TT_NUMBER]
@@ -1458,7 +1458,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
 
 ModulWindowLayout::~ModulWindowLayout()
 {
-    EndListening(m_aColorConfig);
+    m_aColorConfig.RemoveListener(this);
 }
 
 void __EXPORT ModulWindowLayout::Resize()
@@ -1652,13 +1652,8 @@ void ModulWindowLayout::DataChanged(DataChangedEvent const & rDCEvt)
 }
 
 // virtual
-void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
+void ModulWindowLayout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
-    (void)rBc;
-
-    if (rHint.ISA(SfxSimpleHint)
-        && (static_cast< SfxSimpleHint const & >(rHint).GetId()
-            == SFX_HINT_COLORS_CHANGED))
     {
         Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).
                      nColor);
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 685217e337eb..7b7655737ae8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -48,7 +48,7 @@ class SvxSearchItem;
 #endif
 #include <basic/sbmod.hxx>
 #include <vcl/split.hxx>
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
 #include <svtools/colorcfg.hxx>
 
 #include <sfx2/progress.hxx>
@@ -155,7 +155,7 @@ protected:
     virtual void    Command( const CommandEvent& rCEvt );
     virtual void    LoseFocus();
     virtual void    RequestHelp( const HelpEvent& rHEvt );
-    virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster* );
+    virtual void    ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     void            DoSyntaxHighlight( ULONG nPara );
     String          GetWordAtCursor();
@@ -447,7 +447,7 @@ public:
     void                    SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
 };
 
-class ModulWindowLayout: public Window, public SfxListener
+class ModulWindowLayout: public Window, public utl::ConfigurationListener
 {
 private:
 
@@ -470,8 +470,7 @@ private:
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
-    using Window::Notify;
-    virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 
     void updateSyntaxHighlighting();
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 56a275b081a2..efebad44adfe 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_basctl.hxx"
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
 #include <ide_pch.hxx>
@@ -40,7 +40,7 @@
 
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <basic/sbx.hxx>
 #include <vcl/sound.hxx>
 #include <svtools/xtextedt.hxx>
@@ -719,7 +719,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     }
 }
 
-void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster* )
+void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
 {
     ImplSetFont();
 }
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index b821c7ca51c6..044c61d5cc21 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -36,7 +36,7 @@
 #define GLOBALOVERFLOW2
 #include <basic/sbx.hxx>
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <ide_pch.hxx>
 
 #define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e6b147cc46c8..2d2e0f6a5693 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -52,7 +52,7 @@
 
 #define _SOLAR__PRIVATE 1
 #include <basic/sbx.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include <tools/diagnose_ex.h>
 #include <basidesh.hrc>
 #include <basidesh.hxx>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index d10bdbc0e7f2..ce96ca3892a9 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -37,7 +37,7 @@
 
 #define _SVICNVW_HXX
 #include <svtools/svtreebx.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <basic/sbstar.hxx>
 #include <sbxitem.hxx>
 #include "basobj.hxx"
diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc
index aaf243b5475a..1fcfc9286cff 100644
--- a/basctl/source/basicide/brkdlg.hrc
+++ b/basctl/source/basicide/brkdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _BRKDLG_HRC
 #define _BRKDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_BREAKPOINTDLG      ( RID_BASICIDE_START + 80 )
 
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 4029e45fe082..9f294b87577d 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -33,11 +33,11 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/menu.hxx>
 
-#include <svtools/svarray.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
 
 #define _BASIC_TEXTPORTIONS
 #include <basic/sbdef.hxx>
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index cf8ed498d474..5f2ed2301758 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/genlink.hxx>
 
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <iderid.hxx>
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index 6702af8febab..23005cddd294 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _MACRODLG_HRC
 #define _MACRODLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROCHOOSER                ( RID_BASICIDE_START + 50 )
 #define RID_STR_BTNDEL                  ( RID_BASICIDE_START + 51 )
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 88f167167d42..755e382cf618 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _MODULDLG_HRC
 #define _MODULDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_STR_LIB             1
 #define RID_TRLBOX              2
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
index a03a90c2d59a..ca1e43e080fb 100644
--- a/basctl/source/basicide/moptions.hrc
+++ b/basctl/source/basicide/moptions.hrc
@@ -30,7 +30,7 @@
 #ifndef _MOPTIONS_HRC
 #define _MOPTIONS_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_MACROOPTIONS        ( RID_BASICIDE_START + 55 )
 
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 7004541ea465..490a38a5c8fd 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -30,7 +30,7 @@
 #ifndef _OBJDLG_HRC
 #define _OBJDLG_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index b9ffe708e6fa..a87ad521c2f5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -70,7 +70,7 @@
 
 #include <xmlscript/xmldlg_imexp.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include <unotools/collatorwrapper.hxx>
 
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index e2af9e0346a1..b23f540f2c10 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -42,7 +42,7 @@
 #include <tbxctl.hrc>
 #include <idetemp.hxx>
 #include <sfx2/imagemgr.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
 #include <vcl/toolbox.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc
index 1811614d9d37..b26570b5b8bf 100644
--- a/basctl/source/basicide/tbxctl.hrc
+++ b/basctl/source/basicide/tbxctl.hrc
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 #define RID_TBXCONTROLS         ( RID_BASICIDE_START + 65 )
 #define RID_TOOLBOX             ( RID_BASICIDE_START + 66 )
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 6d1080ed659b..423ef39079a0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -46,7 +46,7 @@
 #include <iderdll.hxx>
 #include <vcl/scrbar.hxx>
 #include <tools/shl.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 8552f9f09e10..db446d479ead 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -37,7 +37,7 @@
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <vector>
 
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 45eace9f6137..4c361d4545f5 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -36,7 +36,7 @@
 #endif
 
 #include <bastypes.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c917de5a6dee..a2911dcccb8f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -32,7 +32,7 @@
 
 #include "scriptdocument.hxx"
 #include <tools/string.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
 #include <com/sun/star/io/XInputStreamProvider.hpp>
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 908331b0ad63..9a75e80a53e2 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -38,8 +38,8 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
 
 #define DLGED_PAGE_WIDTH_MIN    1280
 #define DLGED_PAGE_HEIGHT_MIN   1024
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 928434749862..b92be11b286f 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -33,7 +33,7 @@
 
 // include     -----------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Dialog Control Id's -----------------------------------------------------------
 
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 8e3fa615d960..f9be90b38b4b 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -37,8 +37,8 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <comphelper/composedprops.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/childwin.hxx>
 #include <svx/svdmark.hxx>
 
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 654e283128fb..b1192b51d9bf 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -31,7 +31,7 @@
 #define _SBXITEM_HXX
 
 #include "scriptdocument.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 const USHORT BASICIDE_TYPE_UNKNOWN  =   0;
 const USHORT BASICIDE_TYPE_SHELL    =   1;
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
index 6af1dc5b04fb..f763ce8f81c6 100644
--- a/extensions/inc/extensio.hrc
+++ b/extensions/inc/extensio.hrc
@@ -30,7 +30,7 @@
 #ifndef EXTENSIONS_INC_EXTENSIO_HRC
 #define EXTENSIONS_INC_EXTENSIO_HRC
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // -----------------------------------------------------------------------
 // - resource id areas
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index f667c6bdfdfb..dc490b49c28e 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -507,11 +507,11 @@
 
 
 
-#include "svtools/filenotation.hxx"
+#include "svl/filenotation.hxx"
 #include "svtools/imgdef.hxx"
 #include "svtools/miscopt.hxx"
 #include "unotools/moduleoptions.hxx"
-#include "svtools/numuno.hxx"
+#include "svl/numuno.hxx"
 
 #include "svx/flagsdef.hxx"
 
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 6569c475f640..a12003e5d1a9 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -39,7 +39,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/pathoptions.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 #include <sfx2/docfilt.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 4cab6ef50526..218d15455cbd 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_extensions.hxx"
 
 #include <bibconfig.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -244,6 +244,10 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
     SetModified();
 };
 //---------------------------------------------------------------------------
+void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+{
+}
+
 void    BibConfig::Commit()
 {
     const Sequence<OUString> aPropertyNames = GetPropertyNames();
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 178da765818f..7237b0a12695 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -114,6 +114,7 @@ public:
     ~BibConfig();
 
     virtual void    Commit();
+    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
 
     BibDBDescriptor         GetBibliographyURL();
     void                    SetBibliographyURL(const BibDBDescriptor& rDesc);
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 3d9667b94f06..e73c13b55814 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -36,9 +36,9 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/weak.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <uno/environment.h>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 573c5756132b..3b9d7e53b8d7 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -34,7 +34,7 @@
 
 #include <tools/resmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <com/sun/star/lang/XLocalizable.hpp>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5a901447865f..0c47c2917e46 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -60,7 +60,7 @@
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/contentidentifier.hxx>
 #include <comphelper/container.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
 #include <vcl/dialog.hxx>
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index ac7ce58a8f49..99304c394021 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <cppuhelper/implbase5.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 #include "bibmod.hxx"
 class BibDataManager;
diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src
index d06cce2e4361..6b68a97afa3d 100644
--- a/extensions/source/bibliography/menu.src
+++ b/extensions/source/bibliography/menu.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #include <svx/svxids.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 899154682264..f3a322f038e8 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -39,7 +39,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 #include <cppuhelper/implbase1.hxx> // helper for implementations
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index c9e657dd2f69..efc79f53744d 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -53,7 +53,7 @@
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #ifndef SVTOOLS_FILENOTATION_HXX_
-#include <svtools/filenotation.hxx>
+#include <svl/filenotation.hxx>
 #endif
 //.........................................................................
 namespace dbp
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 33bc61be819a..653006035eae 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -31,7 +31,7 @@
 #include "componentmodule.hxx"
 #include <tools/resmgr.hxx>
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 #include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 2d6fc581f3a6..1893b1579dc2 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -46,8 +46,8 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
 #include <sfx2/sfxsids.hrc>
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 3121b6b07bc5..0279dbc3f4ab 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -34,8 +34,8 @@
 #include "componentmodule.hxx"
 #include <tools/debug.hxx>
 #include <sfx2/docfile.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/pathoptions.hxx>
 #ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index 49b43114d20e..cde464dd88cb 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -40,7 +40,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/scrbar.hxx>
 
 //.........................................................................
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 05d0984349b4..56a4c0685c8d 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -71,8 +71,8 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/app.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d77b8dc7d0c2..8d7429ce63de 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -89,14 +89,14 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/ctloptions.hxx>
 #include <svtools/colrdlg.hxx>
-#include <svtools/filenotation.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/filenotation.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svtools/numuno.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/numuno.hxx>
+#include <svl/urihelper.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/numinf.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/extensions/source/propctrlr/formhelpid.hrc b/extensions/source/propctrlr/formhelpid.hrc
index 529c3b30d97b..e6f4aebee5dd 100644
--- a/extensions/source/propctrlr/formhelpid.hrc
+++ b/extensions/source/propctrlr/formhelpid.hrc
@@ -32,10 +32,10 @@
 #define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
-// TODO: create a new help id range in <svtools/solar.hrc>
+// TODO: create a new help id range in <svl/solar.hrc>
 // at the moment, the help ids are ripped from svx/inc/fmhelper.hrc
 // (the old property browser was implemented in svx)
 
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 8d730d3e8c9c..d81966e39257 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -45,7 +45,7 @@
 #include <tools/debug.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc
index 705638accf98..338b0eebab88 100644
--- a/extensions/source/propctrlr/propresid.hrc
+++ b/extensions/source/propctrlr/propresid.hrc
@@ -31,7 +31,7 @@
 #ifndef EXTENSIONS_PROPRESID_HRC
 #define EXTENSIONS_PROPRESID_HRC
 
-// TODO: create a new resource range in <svtools/solar.hrc>
+// TODO: create a new resource range in <svl/solar.hrc>
 
 #define RID_PROPCONTROLLER_START        1000
     // arbitrary at the moment
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 26d46aa7dec9..dac5ccca77d5 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -55,7 +55,7 @@
 #include <vcl/floatwin.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <unotools/datetime.hxx>
 #include <i18npool/mslangid.hxx>
 #ifndef _SV_BUTTON_HXX
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 005659f3576a..b27afa750fa6 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -36,10 +36,10 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 /** === end UNO includes === **/
-#include <svtools/numuno.hxx>
+#include <svl/numuno.hxx>
 #include <rtl/math.hxx>
 #include <tools/debug.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 70759e9c5ad7..ea34b2678d14 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/xforms/XDataTypeRepository.hpp>
 /** === end UNO includes === **/
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <tools/diagnose_ex.h>
 
 //........................................................................
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 4b85ab076a1b..402323630361 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -335,15 +335,15 @@
 
 #include "svtools/cliplistener.hxx"
 #include "svtools/imageresourceaccess.hxx"
-#include "svtools/inetstrm.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/languageoptions.hxx"
+#include "svl/inetstrm.hxx"
+#include "svl/inettype.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/languageoptions.hxx"
 #include "unotools/lingucfg.hxx"
-#include "svtools/numuno.hxx"
-#include "svtools/poolitem.hxx"
-#include "svtools/solar.hrc"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/solar.hrc"
 #include "svtools/transfer.hxx"
 
 #include "svx/editdata.hxx"
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 1b19b794d273..28fb27c94958 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -34,7 +34,7 @@
 #include <tools/debug.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 //.........................................................................
 namespace frm
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 96412feed10a..cc5cf9ee7a27 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -81,8 +81,8 @@
 #include <osl/mutex.hxx>

 #include <rtl/math.hxx>

 #include <rtl/tencinfo.h>

-#include <svtools/inetstrm.hxx>

-#include <svtools/inettype.hxx>

+#include <svl/inetstrm.hxx>

+#include <svl/inettype.hxx>

 #include <tools/debug.hxx>

 #include <tools/diagnose_ex.h>

 #include <tools/fsys.hxx>

diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index bc0e952f1735..9fd440ffa460 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -42,8 +42,8 @@
 #include <comphelper/numbers.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/numuno.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <vcl/wintypes.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 5d30c2776659..47391b390958 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -65,7 +65,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/guarding.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 
 #include <memory>
 
diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc
index b446914fd114..c25ca4f2b6e4 100644
--- a/forms/source/inc/frm_resource.hrc
+++ b/forms/source/inc/frm_resource.hrc
@@ -32,7 +32,7 @@
 #define _FRM_RESOURCE_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index aa2df00e28c5..b3369b865475 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -39,7 +39,7 @@
 //---------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 //.........................................................................
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 68a3660d65e1..9f6c4c15ed68 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_forms.hxx"
 #include "parametrizedattributedispatcher.hxx"
 #include <svx/editview.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 43f784f2219c..76973f5e0348 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -51,8 +51,8 @@
 
 #include <svx/svxids.hrc>
 #include <svx/editview.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <sfx2/msgpool.hxx>
 
 //--------------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 5ad8fbe52353..b87d6260b723 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "richtextengine.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/editobj.hxx>
 #define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
@@ -45,7 +45,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 #include <unotools/lingucfg.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #include <vos/mutex.hxx>
 
 #include <algorithm>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index bcfb0fc2ad35..f85bab638499 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -43,8 +43,8 @@
 #include <svx/scripttypeitem.hxx>
 
 #include <svx/editobj.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index f3c56cc6cd88..495a85c02162 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -32,9 +32,9 @@
 #include "precompiled_forms.hxx"
 #include "richtextvclcontrol.hxx"
 #include "richtextimplcontrol.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/languageoptions.hxx>
 #if OSL_DEBUG_LEVEL > 0
     #ifndef _TOOLS_TEMPFILE_HXX
     #include <tools/tempfile.hxx>
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 8760a59bc180..d1090b82d914 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -36,8 +36,8 @@
 #include <svx/svxids.hrc>
 #endif
 #include <svx/eeitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index 3cc79ad7bef3..d5874ea566c2 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/solar.h>
 #include <sal/types.h>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 //........................................................................
 namespace frm
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 46272c68b69f..65e8459bea3f 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc  lingucomponent  :      linguistic libtextcat svtools hyphen HUNSPELL:hunspell NULL
+lc  lingucomponent  :      linguistic libtextcat svl hyphen HUNSPELL:hunspell NULL
 lc	lingucomponent								usr1	-	all	lc_mkout NULL
 lc  lingucomponent\inc                                      nmake   -   all lc_inc NULL
 lc  lingucomponent\source\lingutil                          nmake   -   all lc_util lc_inc NULL
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index ac3ac3b7d3a0..e4bf1d88d220 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -71,9 +71,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB) 	 \
         $(VOSLIB)		\
         $(TOOLSLIB)		\
-        $(SVTOOLLIB)	\
         $(SVLLIB)		\
-        $(VCLLIB)		\
         $(SALLIB)		\
         $(UCBHELPERLIB)	\
         $(UNOTOOLSLIB)	\
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index cf07edb7023e..b4df02bb2e78 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -88,6 +88,8 @@ namespace
     {
         sal_Int16 m_nODF;
     public:
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
         SaveODFItem();
         //See group ODF in Common.xcs
         bool isLessODF1_2()
@@ -96,6 +98,9 @@ namespace
         }
     };
 
+void SaveODFItem::Commit() {}
+void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+
     SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
         "Office.Common/Save"))), m_nODF(0)
     {
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 8d7e082cea6b..c0f9f4cd3dcb 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 9d469a53a479..a1d48344820a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/security/SerialNumberAdapter.hpp>
 #include <comphelper/sequence.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/pickerhelper.hxx>
+#include <svl/pickerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 693d003b0d77..f1b47c3f0f0d 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -36,8 +36,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/syslocale.hxx>
+#include <svl/solar.hrc>
+#include <unotools/syslocale.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustrbuf.h>
 #include <vector>
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index c0f2db15eff7..bc5747ed3c88 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -41,14 +41,14 @@
 #endif
 #include <vcl/image.hxx>
 //#ifndef _SFXITEMPOOL_HXX
-//#include <svtools/itempool.hxx>
+//#include <svl/itempool.hxx>
 //#endif
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 
 #include <xmlsecurity/stbcontrl.hxx>