#i103496#: split svtools; improve ConfitItems

140 files changed, 420 insertions, 420 deletions

diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 177e3611d5ad..bd0a21ca0dae 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -31,7 +31,7 @@
 #define _SFX_ARRDECL_HXX
 
 #include <tools/list.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/minarray.hxx>
 
 struct CntUpdateResult;
diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx
index 91c05547df2b..9e97bef83cb3 100644
--- a/sfx2/inc/minfitem.hxx
+++ b/sfx2/inc/minfitem.hxx
@@ -33,7 +33,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 class BasicManager;
 
 class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem
diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx
index c076f48f312f..e6e1e11acffb 100644
--- a/sfx2/inc/msgnodei.hxx
+++ b/sfx2/inc/msgnodei.hxx
@@ -32,9 +32,9 @@
 #define _MSGNODEI_HXX
 
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/list.hxx>
 struct SfxMsgAttachFile {
     String  aFile;
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 442afca362aa..1ced4f3b0416 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_ORGMGR_HXX
 #define _SFX_ORGMGR_HXX
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxDocumentTemplates;
 class SfxOrganizeListBox_Impl;
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 07483990a655..4970d67cf5eb 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -493,104 +493,104 @@
 #include "sot/storinfo.hxx"
 #include "svtools/accessibilityoptions.hxx"
 #include "svtools/addxmltostorageoptions.hxx"
-#include "svtools/adrparse.hxx"
-#include "svtools/aeitem.hxx"
+#include "unotools/adrparse.hxx"
+#include "svl/aeitem.hxx"
 #include "svtools/asynclink.hxx"
-#include "svtools/brdcst.hxx"
-#include "svtools/cancel.hxx"
-#include "svtools/cntwids.hrc"
+#include "svl/brdcst.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cntwids.hrc"
 #include "svtools/controldims.hrc"
 #include "svtools/cstitem.hxx"
-#include "svtools/ctypeitm.hxx"
+#include "svl/ctypeitm.hxx"
 #include "svtools/dateitem.hxx"
 #include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/ehdl.hxx"
-#include "svtools/eitem.hxx"
+#include "svl/eitem.hxx"
 #include "svtools/embedhlp.hxx"
 #include "svtools/embedtransfer.hxx"
 #include "unotools/eventcfg.hxx"
 #include "unotools/extendedsecurityoptions.hxx"
-#include "svtools/flagitem.hxx"
-#include "svtools/folderrestriction.hxx"
+#include "svl/flagitem.hxx"
+#include "svl/folderrestriction.hxx"
 #include "unotools/fontoptions.hxx"
 #include "svtools/framestatuslistener.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/hint.hxx"
+#include "svl/hint.hxx"
 #include "unotools/historyoptions.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/htmltokn.h"
-#include "svtools/imageitm.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imagemgr.hxx"
 #include "svtools/imap.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/inetdef.hxx"
-#include "svtools/inethist.hxx"
-#include "svtools/inetmsg.hxx"
+#include "svl/inetdef.hxx"
+#include "svl/inethist.hxx"
+#include "svl/inetmsg.hxx"
 #include "unotools/inetoptions.hxx"
-#include "svtools/inetstrm.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inetstrm.hxx"
+#include "svl/inettype.hxx"
 #include "unotools/internaloptions.hxx"
-#include "svtools/intitem.hxx"
-#include "svtools/isethint.hxx"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
 #include "svtools/itemdel.hxx"
-#include "svtools/itemiter.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemprop.hxx"
-#include "svtools/itemset.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
 #include "svtools/javacontext.hxx"
-#include "svtools/lckbitem.hxx"
+#include "svl/lckbitem.hxx"
 #include "unotools/localisationoptions.hxx"
 #include "svtools/localresaccess.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/memberid.hrc"
+#include "svl/lstner.hxx"
+#include "svl/memberid.hrc"
 #include "svtools/menuoptions.hxx"
-#include "svtools/misccfg.hxx"
+#include "unotools/misccfg.hxx"
 #include "svtools/miscopt.hxx"
 #include "unotools/moduleoptions.hxx"
-#include "svtools/ownlist.hxx"
+#include "svl/ownlist.hxx"
 #include "svtools/parhtml.hxx"
 #include "unotools/pathoptions.hxx"
-#include "svtools/pickerhelper.hxx"
-#include "svtools/poolitem.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
 #include "svtools/printoptions.hxx"
 #include "unotools/printwarningoptions.hxx"
-#include "svtools/rectitem.hxx"
+#include "svl/rectitem.hxx"
 #include "unotools/regoptions.hxx"
 #include "unotools/saveopt.hxx"
 #include "unotools/searchopt.hxx"
 #include "unotools/securityoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/slstitm.hxx"
-#include "svtools/smplhint.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
 #include "svtools/soerr.hxx"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "unotools/startoptions.hxx"
 #include "svtools/statusbarcontroller.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/style.hrc"
-#include "svtools/style.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svdde.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hrc"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svdde.hxx"
+#include "svl/svstdarr.hxx"
 #include "svtools/svtdata.hxx"
-#include "svtools/svtools.hrc"
-#include "svtools/syslocale.hxx"
-#include "svtools/syslocaleoptions.hxx"
-#include "svtools/szitem.hxx"
+#include "svl/svtools.hrc"
+#include "unotools/syslocale.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
 #include "svtools/templatefoldercache.hxx"
 #include "svtools/toolboxcontroller.hxx"
 #include "svtools/transfer.hxx"
 #include "svtools/ttprops.hxx"
-#include "svtools/undo.hxx"
+#include "svl/undo.hxx"
 #include "unotools/undoopt.hxx"
-#include "svtools/urihelper.hxx"
-#include "svtools/urlbmk.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
 #include "unotools/useroptions.hxx"
 #include "unotools/viewoptions.hxx"
-#include "svtools/visitem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
 #include "unotools/workingsetoptions.hxx"
-#include "svtools/zforlist.hxx"
+#include "svl/zforlist.hxx"
 #include "toolkit/awt/vclxwindow.hxx"
 #include "toolkit/helper/convert.hxx"
 #include "tools/bigint.hxx"
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 99deee0c97a3..9f035b125a31 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -34,8 +34,8 @@
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
 #include <tools/solar.h>
-#include <svtools/smplhint.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
@@ -94,7 +94,6 @@ class SfxModule;
 class SfxModuleArr_Impl;
 class Window;
 class INetURLObject;
-class SfxMiscCfg;
 struct SfxConstant;
 struct SfxChildWinFactory;
 struct SfxMenuCtrlFactory;
@@ -229,7 +228,6 @@ public:
     USHORT                      GetFreeIndex();
     void                        ReleaseIndex(USHORT i);
     SfxEventConfiguration*      GetEventConfig() const;
-    SfxMiscCfg*                 GetMiscConfig();
 
     // Basic/Scripting
     static sal_Bool             IsXScriptURL( const String& rScriptURL );
diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx
index e0213e8d8131..773d2fd82d6b 100644
--- a/sfx2/inc/sfx2/appuno.hxx
+++ b/sfx2/inc/sfx2/appuno.hxx
@@ -65,9 +65,9 @@
 //  something else header
 //____________________________________________________________________________________________________________________________________
 #include <tools/errcode.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <sfx2/sfxuno.hxx>
 
 //____________________________________________________________________________________________________________________________________
diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc
index a67c306e61a2..7351672f13ae 100644
--- a/sfx2/inc/sfx2/cntids.hrc
+++ b/sfx2/inc/sfx2/cntids.hrc
@@ -32,11 +32,11 @@
 #define _CNTIDS_HRC
 
 #ifndef _CNTWIDS_HRC
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #endif
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 // Slot-ID's -----------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index f5662777d7ee..51ed03c1e70d 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -33,7 +33,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SfxPoolItem;
 class SfxBindings;
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 27da2810d49e..c8acf929b089 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -37,15 +37,15 @@
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/svmedit.hxx>
 
 #include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/headbar.hxx>
-#include <svtools/syslocale.hxx>
-#include <svtools/zforlist.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/zforlist.hxx>
 
 #include "tabdlg.hxx"
 
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index a96f97f20fe7..363c9280fd5a 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -37,7 +37,7 @@
 #include <stdarg.h>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index e8ae3f5d1d85..5488bb4e87e4 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -48,10 +48,10 @@
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
 #include <tools/list.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 #include <tools/globname.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/content.hxx>
 
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index bec05af5dfaa..10e586030f52 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -33,7 +33,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
 #include <unotools/eventcfg.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index cfe8629cd0cf..647746abe84f 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -38,7 +38,7 @@
 #include <vcl/button.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/event.hxx>
 
 #include <sfx2/sfxsids.hrc>
@@ -46,7 +46,7 @@
 #undef ITEMID_MACRO
 #endif
 #define ITEMID_MACRO SID_ATTR_MACROITEM
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 class SfxMacroInfo;
 class SfxMacroInfoArr_Impl;
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 3fd8801c10a9..e48a7c000094 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/window.hxx>
 
 #include <sfx2/docfilt.hxx>
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index 2443fcb345a9..38731e032328 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -68,9 +68,9 @@ namespace com
 #include <tools/link.hxx>
 #include <tools/ref.hxx>
 #include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 #include <tools/list.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 class SvBorder;
 class SfxWorkWindow;
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index d6cd9f334f27..07098d74b658 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -34,10 +34,10 @@
 #include "sfx2/dllapi.h"
 
 #include <sfx2/sfxsids.hrc>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/gen.hxx>
 
 class SvStream;
diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx
index ed863cde7fb7..b1fd8934d393 100644
--- a/sfx2/inc/sfx2/itemwrapper.hxx
+++ b/sfx2/inc/sfx2/itemwrapper.hxx
@@ -33,10 +33,10 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 
 // ============================================================================
 
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 86035885fc43..960faed33473 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -34,7 +34,7 @@
 #include "sfx2/dllapi.h"
 #include <sfx2/linksrc.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxObjectShell;
 
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 9540e1e396b2..d27f660bd275 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -35,7 +35,7 @@
 #include "sal/types.h"
 #include <tools/errcode.hxx>
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <sfx2/evntconf.hxx>
 
 class SfxMacroInfo;
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index d72023ea40c4..d197b6fe544d 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -35,7 +35,7 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx
index b6ab4eb4a065..bc45f9303a96 100644
--- a/sfx2/inc/sfx2/msgpool.hxx
+++ b/sfx2/inc/sfx2/msgpool.hxx
@@ -36,7 +36,7 @@
 
 #include <sfx2/msg.hxx>
 #include <tools/string.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 class SfxInterface;
 class SfxSlot;
diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx
index ff2b913381fe..e82e92f188c1 100644
--- a/sfx2/inc/sfx2/objitem.hxx
+++ b/sfx2/inc/sfx2/objitem.hxx
@@ -32,7 +32,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 
 #include <sfx2/shell.hxx>
 
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 7e3813584de9..2066556ba90f 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -58,7 +58,7 @@
 //#if 0 // _SOLAR__PRIVATE
 #include <vcl/timer.hxx>
 //#endif
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/bitmap.hxx>
 #include <sot/storage.hxx>
diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx
index f4303c0e28e9..c0b015f3bc60 100644
--- a/sfx2/inc/sfx2/objuno.hxx
+++ b/sfx2/inc/sfx2/objuno.hxx
@@ -51,7 +51,7 @@
 
 #include <com/sun/star/io/IOException.hpp>
 
-#include <svtools/itemprop.hxx>
+#include <svl/itemprop.hxx>
 #include <cppuhelper/implbase10.hxx>
 
 #include "sfxuno.hxx"
diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx
index e2e88b3df5c1..c9fef61cc318 100644
--- a/sfx2/inc/sfx2/querystatus.hxx
+++ b/sfx2/inc/sfx2/querystatus.hxx
@@ -33,7 +33,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/conditn.hxx>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 6fa5001aa301..dfb25ae2a952 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -33,8 +33,8 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/itemset.hxx>
-#include <svtools/hint.hxx>
+#include <svl/itemset.hxx>
+#include <svl/hint.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 1605f689471f..9bba3997a71f 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -33,11 +33,11 @@
 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #ifndef _MEMBERID_HRC
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #endif
 
 #define RID_GROUPS_OFFSET           32000
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 6ef67b6a009a..b7bb0fc93be1 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -103,7 +103,7 @@
 
 //  include of my own project
 //________________________________________________________________________________________________________
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 //________________________________________________________________________________________________________
 //  defines
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index 899edd2cd201..270087cf24a9 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -36,7 +36,7 @@
 #include "sal/types.h"
 #include <i18npool/lang.h>
 #include <svtools/parhtml.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 
 class ImageMap;
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index c15c09a09384..32e31e782675 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 #endif
 
 #define SID_SFX_START                5000
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index 5ada198c7795..735cc3c88562 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -33,7 +33,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/conditn.hxx>
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 69169a6d3d10..f7fac480dccd 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <tools/debug.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
 
 #include <tools/ownlist.hxx>
 #include <tools/unqid.hxx>
diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx
index 3547fc14515c..594d12cf05b5 100644
--- a/sfx2/inc/sfx2/srchitem.hxx
+++ b/sfx2/inc/sfx2/srchitem.hxx
@@ -39,7 +39,7 @@
 #include <unotools/configitem.hxx>
 #include <rsc/rscsfx.hxx>
 #include <tools/string.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <sfx2/msg.hxx>
 #include <sfx2/srchdefs.hxx>
 
@@ -112,6 +112,7 @@ public:
 
     // ConfigItem
     virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void            Commit();
 
             sal_uInt16      GetCommand() const { return nCommand; }
             void            SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 3cac4227116f..d2fae3e9f534 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -37,8 +37,8 @@
 #include <vcl/button.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
 #if ENABLE_LAYOUT
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 08ea57d12e3a..0fa9b92de7fc 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -33,12 +33,12 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include "sal/types.h"
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/frame/status/Verb.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index d0ac30a9fcd9..83ac73dbdd80 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 5281abcc7074..53953c8db3ee 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -30,7 +30,7 @@
 #ifndef _SFX_SORGITM_HXX
 #define _SFX_SORGITM_HXX
 
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 // class SfxScriptOrganizerItem ---------------------------------------------
 
diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx
index 0ec27c2ac36d..6d1b7cce6bc5 100644
--- a/sfx2/inc/stbitem.hxx
+++ b/sfx2/inc/stbitem.hxx
@@ -32,7 +32,7 @@
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svtools/statusbarcontroller.hxx>
 
 //------------------------------------------------------------------
diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx
index 25743f78ec08..d50298b59716 100644
--- a/sfx2/inc/tplpitem.hxx
+++ b/sfx2/inc/tplpitem.hxx
@@ -34,7 +34,7 @@
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 
 class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem
 {
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index a432bd437b77..8d13066a8340 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -45,19 +45,19 @@
 #include <tools/config.hxx>
 #include <basic/basrdll.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _SOUND_HXX //autogen
 #include <vcl/sound.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/urlbmk.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
@@ -65,7 +65,7 @@
 #endif
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -153,8 +153,8 @@
 #include <unotools/fontoptions.hxx>
 #include <unotools/internaloptions.hxx>
 #include <unotools/workingsetoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <unotools/syslocale.hxx>
 #include <framework/addonsoptions.hxx>
 #include <svtools/ttprops.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index e7b8316ea861..4fe352c3c4bc 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -36,15 +36,15 @@
 #include <com/sun/star/uno/Reference.h>
 #include <basic/basrdll.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <basic/sbxfac.hxx>
 #include <basic/sbx.hxx>
 #include <vcl/gradient.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <basic/sbmod.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbstar.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 4a264c4566f0..5638800a9e4f 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -46,24 +46,24 @@
 #include <vcl/sound.hxx>
 #include <vcl/msgbox.hxx>
 #include <tools/string.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/szitem.hxx>
-#include <svtools/undo.hxx>
+#include <svl/itempool.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/szitem.hxx>
+#include <svl/undo.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/ttprops.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sot/exchange.hxx>
 
 //#include <svtools/agprop.hxx>
 //#include <sj2/sjapplet.hxx>
-#include <svtools/isethint.hxx>
+#include <svl/isethint.hxx>
 
 #include <unotools/configmgr.hxx>
 #include <tools/urlobj.hxx>
@@ -79,7 +79,6 @@
 #include <unotools/localfilehelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svtools/misccfg.hxx>
 
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
@@ -1075,10 +1074,3 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync
 
 IMPL_OBJHINT( SfxStringHint, String )
 
-SfxMiscCfg* SfxApplication::GetMiscConfig()
-{
-    if ( !pAppData_Impl->pMiscConfig )
-        pAppData_Impl->pMiscConfig = new SfxMiscCfg;
-
-    return pAppData_Impl->pMiscConfig;
-}
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index f9698c3b4782..5817337ae60d 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -33,8 +33,8 @@
 
 #ifndef GCC
 #endif
-#include <svtools/whiter.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/eitem.hxx>
 
 #include <sfx2/app.hxx>
 #include "appdata.hxx"
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 23de7317c379..e53a4cacdb93 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -33,17 +33,17 @@
 #include <tools/cachestr.hxx>
 #include <tools/config.hxx>
 #ifndef _INETSTRM_HXX //autogen
-#include <svtools/inetstrm.hxx>
+#include <svl/inetstrm.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 #define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <vos/mutex.hxx>
 
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/wrkwin.hxx>
 #include "comphelper/processfactory.hxx"
@@ -109,7 +109,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
         pEventConfig(0),
         pDisabledSlotList( 0 ),
         pSecureURLs(0),
-        pMiscConfig(0),
         pSaveOptions( 0 ),
         pUndoOptions( 0 ),
         pHelpOptions( 0 ),
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index b28f7bcad460..f5b3a2e6dca1 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -31,12 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <vcl/wrkwin.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/svdde.hxx>
+#include <svl/stritem.hxx>
+#include <svl/svdde.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/linkmgr.hxx>
 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 1603a6775ce5..837ccc461586 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <svtools/soerr.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <unotools/saveopt.hxx>
 #include <unotools/localisationoptions.hxx>
 #include <tools/config.hxx>
@@ -46,9 +46,9 @@
 #include <tools/resary.hxx>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 92817d0dbee1..253311c54f3d 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -37,12 +37,11 @@
 
 #include <stdio.h>
 #include <tools/urlobj.hxx>
-#include <svtools/cstitem.hxx>
 #include <tools/config.hxx>
 #include <svtools/ehdl.hxx>
 #include <unotools/startoptions.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/itempool.hxx>
+#include <svl/urihelper.hxx>
 #include <svtools/helpopt.hxx>
 #include <vos/process.hxx>
 #include <framework/sfxhelperfunctions.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 7af52a15cddf..1bb12990cb42 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -36,10 +36,10 @@
 #include <vos/process.hxx>
 #endif
 #include <vos/xception.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/filter.hxx>
 #include <unotools/internaloptions.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 24b1437abc26..bf3cb633cf6a 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -64,16 +64,16 @@
 #include <comphelper/sequenceasvector.hxx>
 
 #include <vcl/wrkwin.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/doctempl.hxx>
 #include <svtools/sfxecode.hxx>
 #include <framework/preventduplicateinteraction.hxx>
 #include <svtools/ehdl.hxx>
 #include <basic/sbxobj.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -95,7 +95,7 @@
 #include <sfx2/new.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/slstitm.hxx>
+#include <svl/slstitm.hxx>
 #include "objshimp.hxx"
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
@@ -112,7 +112,7 @@
 #include <sfx2/event.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 4dfdbb90b20c..fcfa2c50effc 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -36,14 +36,14 @@
 #ifdef WIN
 #define _TL_LANG_SPECIAL
 #endif
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #include <unotools/saveopt.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
 
 #ifndef GCC
 #endif
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index bc3bf30fc0cc..4580a11270e0 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -62,7 +62,7 @@
 #ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_
 #include <svtools/addresstemplate.hxx>
 #endif
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <unotools/intlwrapper.hxx>
 
 #ifndef _UNOTOOLS_CONFIGMGR_HXX_
@@ -71,10 +71,10 @@
 #include <tools/config.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
-#include <svtools/cancel.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/cancel.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/basrdll.hxx>
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index c9814eb50e6a..7fb6ef35167f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -43,8 +43,8 @@
 #include "sfx2/dllapi.h"
 
 #include <basic/sbx.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/rectitem.hxx>
 #include <tools/debug.hxx>
 #include <tools/wldcrd.hxx>
 
@@ -60,12 +60,12 @@
 #endif
 
 #include <basic/sbxcore.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/lckbitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index e5c93b0bdbba..2bf84f87e973 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 #include <sot/formats.hxx>
 
 #define DDELINK_COLD        0
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index f06ecada0226..3533fb8a428f 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -47,7 +47,7 @@
 
 #define _SVSTDARR_STRINGSDTOR
 
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 
 namespace sfx2
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 8ad25458e1b2..f7ff7b161588 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -39,7 +39,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/timer.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 5f10d4062e68..8a852b44b6f7 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -50,7 +50,7 @@
 
 #include <tools/debug.hxx>
 
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index bf213d1a5d3e..491de2138917 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -74,7 +74,7 @@
 
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_ULONGSSORT
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
@@ -237,6 +237,8 @@ public:
                     ~SfxHelpOptions_Impl();
 
     BOOL            HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; }
+    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+    virtual void            Commit();
 };
 
 static Sequence< ::rtl::OUString > GetPropertyNames()
@@ -309,6 +311,15 @@ SfxHelpOptions_Impl::~SfxHelpOptions_Impl()
     delete m_pIds;
 }
 
+
+void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+}
+
+void SfxHelpOptions_Impl::Commit()
+{
+}
+
 // class SfxHelp_Impl ----------------------------------------------------
 
 class SfxHelp_Impl
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 4e57eea38d57..ab47d04f326f 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -36,9 +36,9 @@
 #include <unotools/useroptions.hxx>
 #include <tools/urlobj.hxx>
 #include <framework/menuconfiguration.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/inethist.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <osl/file.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d2338a9c7226..7287023f1845 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -57,12 +57,12 @@
 #include <vcl/toolbox.hxx>
 #include <tools/rcid.h>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SFXEITEM_HXX //autogen
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 608573af1602..4b4c17a2c5f2 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -60,12 +60,12 @@
 #include <rtl/ustring.hxx>
 #endif
 #include <rtl/ustrbuf.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/lckbitem.hxx>
-#include <svtools/inettype.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/inettype.hxx>
+#include <svl/rectitem.hxx>
 
 #include <sot/storage.hxx>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
@@ -109,9 +109,9 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::beans;
 using namespace ::vos;
-#include <svtools/ctypeitm.hxx>
+#include <svl/ctypeitm.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #include "sfxhelp.hxx"
 #include "sfxbasic.hxx"
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 4086cf2b1b96..5cb4f0200614 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -38,7 +38,7 @@
 
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 96a55c9a95f4..2d1c6db11762 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sfx2.hxx"
 
 #ifndef _INETDEF_HXX
-#include <svtools/inetdef.hxx>
+#include <svl/inetdef.hxx>
 #endif
 #include "svtools/htmlkywd.hxx"
 
@@ -40,7 +40,7 @@
 #include <rtl/tencinfo.h>
 
 #include <unotools/configmgr.hxx>
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include <tools/datetime.hxx>
 
 #include <sfx2/frmhtmlw.hxx>
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 121b8604e02d..8f143bb4baee 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -39,7 +39,7 @@
 #include <basic/sbx.hxx>
 #endif
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/time.hxx>
 
 // wg. nRescheduleLocks
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 13a75eb05693..794ee142708c 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -46,9 +46,9 @@
 #include <svtools/imaprect.hxx>
 #ifndef _SVSTDARR_ULONGS_DECL
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
 #include <rtl/tencinfo.h>
 #include <tools/tenccvt.hxx>
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 58b48db6347a..763595913fcd 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -34,7 +34,7 @@
 #ifndef _SV_RESARY_HXX
 #include <tools/resary.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 48c4b16fbf8c..719837adef94 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 
 #include <hash_map>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/eitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 1c2c047b228d..f39c480fbdeb 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f57ca40e8519..fa3330059859 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -33,14 +33,14 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/whiter.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SFXEITEM_HXX //autogen
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #endif
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 #ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
 #endif
@@ -50,7 +50,7 @@
 #include <stdlib.h>             // wg. bsearch
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/helpopt.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index ebc621a56bd9..d4149421f161 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -35,7 +35,7 @@
 #ifndef _SBX_HXX //autogen
 #include <basic/sbx.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
 #ifndef _BASIC_SBUNO_HXX
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index e65c866428e4..0b0a8d2480ed 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -30,8 +30,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/itempool.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/eitem.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index f5794094f15f..f57d3a3d32f2 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <sfx2/querystatus.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/itemdel.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 61747fae7d32..ef47fc088e32 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -39,10 +39,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
-#include <svtools/itemiter.hxx>
+#include <svl/itemiter.hxx>
 
 #ifndef _ARGS_HXX //autogen
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #endif
 #include <svtools/itemdel.hxx>
 
@@ -51,7 +51,7 @@
 #ifndef GCC
 #endif
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index cba060b812f3..f7bf79f8a0f6 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 #include <sfx2/sfxstatuslistener.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svtools/itemdel.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vos/mutex.hxx>
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 861cbb7485a1..7c88c4bef24a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -33,8 +33,8 @@
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <com/sun/star/embed/VerbAttributes.hpp>
 #include <basic/sbstar.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/undo.hxx>
+#include <svl/itempool.hxx>
+#include <svl/undo.hxx>
 #include <svtools/itemdel.hxx>
 #include <svtools/asynclink.hxx>
 #include <basic/sbx.hxx>
diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx
index 2f667147b64b..5702103e3398 100644
--- a/sfx2/source/control/srchitem.cxx
+++ b/sfx2/source/control/srchitem.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/util/XReplaceDescriptor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
 #include <i18npool/mslangid.hxx>
 
 #ifndef GCC
@@ -359,6 +359,9 @@ void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
     SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() );
 }
 
+void SvxSearchItem::Commit()
+{
+}
 
 void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
 {
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index cb7e0f042f0d..527851e7664a 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -46,10 +46,10 @@
 #include <com/sun/star/frame/FrameAction.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/weak.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/visitem.hxx>
 #include <comphelper/processfactory.hxx>
 
 #ifndef GCC
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 190cc47dc2f6..f33f898237f9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -32,13 +32,13 @@
 #include "precompiled_sfx2.hxx"
 
 #include <tools/debug.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/visitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/visitem.hxx>
 #include <svtools/javacontext.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include <tools/urlobj.hxx>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/frame/XController.hpp>
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 8eec8a8f8e2a..89075b918b42 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -37,7 +37,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/help.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <unotools/viewoptions.hxx>
 #include <svtools/fixedhyper.hxx>
 #include <svtools/controldims.hrc>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 9efd5f5dcf9f..18037f385464 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -32,12 +32,12 @@
 #include "precompiled_sfx2.hxx"
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/useroptions.hxx>
 #include <svtools/imagemgr.hxx>
 #include <tools/datetime.hxx>
@@ -49,7 +49,7 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <unotools/localedatawrapper.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index f31ed1724907..fb31ab3dc252 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/decoview.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index f6db88d4b77a..683aedcbf32f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -73,15 +73,15 @@
 #include <vcl/mnemonic.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/securityoptions.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/filter.hxx>
 #include <unotools/viewoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/helpid.hrc>
-#include <svtools/pickerhelper.hxx>
+#include <svl/pickerhelper.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 848719547ab4..2f9a7574bb2f 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -41,7 +41,7 @@
 #include <sfx2/fcontnr.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <sfx2/filedlghelper.hxx>
 #include <comphelper/sequenceasvector.hxx>
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 01ed733358d9..211afd11bc6d 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -34,7 +34,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <list>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 
 // ============================================================================
 
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index 0ec723649664..2e87d2c4a9ba 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -73,8 +73,8 @@
 
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <unotools/useroptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/extract.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 1300f18e37ac..319c3b873b48 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -37,9 +37,9 @@
 #include <vcl/msgbox.hxx>
 #endif
 #include <vcl/field.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/style.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
@@ -57,7 +57,7 @@
 #include "mgetempl.hrc"
 
 #ifndef _SFX_STYLE_HRC
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
 #endif
 
 // SfxManageStyleSheetPage -----------------------------------------------
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 0e2dc5039a05..05920c07973e 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_sfx2.hxx"
 
 // INCLUDE ---------------------------------------------------------------
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 74330fbc3646..29472b65208b 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -36,7 +36,7 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/printwarningoptions.hxx>
 #include <svtools/printoptions.hxx>
-#include <svtools/flagitem.hxx>
+#include <svl/flagitem.hxx>
 
 
 #include "printopt.hrc"
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index c2b13fae76f1..7782b5178d8f 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/generictoolboxcontroller.hxx>
 #include <vcl/msgbox.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index f8df0ea2b082..7d4e60e117e9 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_sfx2.hxx"
 
 // include ---------------------------------------------------------------
-#include <svtools/whiter.hxx>
-#include <svtools/style.hxx>
+#include <svl/whiter.hxx>
+#include <svl/style.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 81dc51563d4e..1008c76b8d9f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -37,7 +37,7 @@
 #include <unotools/viewoptions.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "appdata.hxx"
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 706739cd0571..c5fcba6dc686 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -34,14 +34,14 @@
 #ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
 #endif
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/style.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/style.hxx>
 #ifndef GCC
 #endif
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/intlwrapper.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index e4475268b57d..111cab903f7e 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -33,7 +33,7 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <vcl/svapp.hxx>
 
 #ifndef GCC
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 5504c7c9b28c..5d2cf91b0c8f 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -34,17 +34,17 @@
 #ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/itemset.hxx>
 #include <unotools/useroptions.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/datetime.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "versdlg.hrc"
 #include "versdlg.hxx"
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3f8ab1ae7177..c914d9fe2927 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -30,7 +30,7 @@
 #include <sfx2/sfx.hrc>
 #include "doc.hrc"
 #define __RSC
-#include <svtools/inetdef.hxx>
+#include <svl/inetdef.hxx>
 //#include <so3/so2defs.hxx>
 
  // -----------------------------------------------------------------------
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 85dc3ce9e671..7902444ad2c4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -90,19 +90,19 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/lckbitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/lckbitem.hxx>
 #include <svtools/sfxecode.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/svparser.hxx> // SvKeyValue
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include <unotools/streamwrap.hxx>
 
@@ -123,7 +123,7 @@ using namespace ::com::sun::star::io;
 #include <unotools/ucblockbytes.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inettype.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -134,7 +134,7 @@ using namespace ::com::sun::star::io;
 #include <ucbhelper/interactionrequest.hxx>
 #include <sot/stg.hxx>
 #include <unotools/saveopt.hxx>
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
 
 #include "opostponedtruncationstream.hxx"
 #include "helper.hxx"
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index ecd9ae7aee42..9615cc4f51a7 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -48,13 +48,13 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 3d5ba474fb3e..a00b047230d1 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -34,7 +34,7 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 017b12b2a430..c761ac94c510 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -44,9 +44,9 @@
 #include <vcl/menubtn.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/print.hxx>
-#include <svtools/style.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/style.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/imagemgr.hxx>
@@ -81,7 +81,7 @@
 #endif
 #include <comphelper/processfactory.hxx>
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 static const char cDelim = ':';
 BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 6f333586a22e..23616edf9279 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -34,7 +34,7 @@
 #include <sot/object.hxx>
 #include <tools/stream.hxx>
 #include <vcl/splitwin.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #ifndef GCC
 #endif
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index c656a4f0cbe9..bceca0db94ca 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -64,8 +64,7 @@
 
 #include <unotools/pathoptions.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/adrparse.hxx>
+#include <svl/itemset.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <tools/debug.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index cffa86c0540d..0fe45c49db95 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -37,8 +37,8 @@
 #ifndef _SVMEDIT_HXX
 #include <svtools/svmedit.hxx>
 #endif
-#include <svtools/itemset.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 193dfae7afaa..ae2353e3c277 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -41,15 +41,15 @@
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <tools/cachestr.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/urihelper.hxx>
-#include <svtools/ctloptions.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/urihelper.hxx>
+#include <svl/ctloptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <unotools/securityoptions.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index f5be69d753e9..295f7db83a11 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -32,12 +32,12 @@
 #include "precompiled_sfx2.hxx"
 
 #ifndef _INETMSG_HXX //autogen
-#include <svtools/inetmsg.hxx>
+#include <svl/inetmsg.hxx>
 #endif
 #include <tools/diagnose_ex.h>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/svparser.hxx> // SvKeyValue
 #include <vos/mutex.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -115,8 +115,8 @@ using namespace ::com::sun::star::container;
 #include <unotools/ucbhelper.hxx>
 #include <tools/inetmime.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/inettype.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/inettype.hxx>
+#include <svl/sharecontrolfile.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 56afae3975df..2c1a79dba418 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -54,10 +54,10 @@
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <tools/urlobj.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 42f9788ec9d2..0af6db738de7 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -34,9 +34,9 @@
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <tools/zcodec.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 1f1cbba7d7e0..eb022afc60df 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -59,7 +59,7 @@
 #include <vos/mutex.hxx>
 
 #include <tools/errcode.hxx>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
 #include <comphelper/string.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index fbbb46853a30..91c0f605e453 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -54,12 +54,12 @@
 #include <vcl/wrkwin.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 #include <tools/rtti.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <sfxhelp.hxx>
 #include <basic/sbstar.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #include <basic/sbx.hxx>
 #include <unotools/eventcfg.hxx>
 
@@ -82,9 +82,9 @@
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <svtools/asynclink.hxx>
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index cd8e28ee771c..d61bd4701e1b 100755
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -43,10 +43,10 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 
-#include <svtools/lstner.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/lstner.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <osl/file.hxx>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 03e6e9170153..158dbdb9e13e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -73,9 +73,9 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>  // can be removed when this is a "real" service
 #include <comphelper/componentcontext.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbuno.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index 223f0b767845..4c7a1fcbe102 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -31,9 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-#include <svtools/itempool.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/stritem.hxx>
 #include <nochaos.hxx>
 #include <sfx2/sfxuno.hxx>
 
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index bd782b76a5ae..8b0420ef1e97 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -32,7 +32,7 @@
 
 #include <tools/link.hxx>
 #include <tools/list.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <vcl/timer.hxx>
 #include <tools/string.hxx>
 #include "rtl/ref.hxx"
@@ -58,7 +58,6 @@ class SfxFilterMatcher;
 class SfxCancelManager;
 class SfxStatusDispatcher;
 class SfxDdeTriggerTopic_Impl;
-class SfxMiscCfg;
 class SfxDocumentTemplates;
 class SfxFrameArr_Impl;
 class SvtSaveOptions;
@@ -122,7 +121,6 @@ public:
     SfxEventConfiguration*              pEventConfig;
     SvUShorts*                          pDisabledSlotList;
     SvStrings*                          pSecureURLs;
-    SfxMiscCfg*                         pMiscConfig;
     SvtSaveOptions*                     pSaveOptions;
     SvtUndoOptions*                     pUndoOptions;
     SvtHelpOptions*                     pHelpOptions;
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
index 53b97b2656ff..f8906a7670dd 100644
--- a/sfx2/source/inc/applet.hxx
+++ b/sfx2/source/inc/applet.hxx
@@ -43,8 +43,8 @@
 #include <cppuhelper/implbase6.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index bf88b5efd7e3..a720c2369cf5 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -57,7 +57,7 @@
 
 #include <vos/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <unotools/eventcfg.hxx>
 
 //--------------------------------------------------------------------------------------------------------
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 1b2cc2220a28..d9ae996bf603 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index bec875659e28..9abfd70ab663 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -45,8 +45,8 @@
 #include <cppuhelper/implbase6.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/sfxuno.hxx>
 #include <sfx2/frmdescr.hxx>
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index bba36717a946..f258ca720b15 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -45,8 +45,8 @@
 #include <cppuhelper/implbase5.hxx>
 
 #include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
 
 #include <sfx2/sfxuno.hxx>
 
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 541fad8c3c2e..6e502bd9d7ad 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -34,7 +34,7 @@
 #include <osl/mutex.hxx>
 #include <tools/string.hxx>
 #include <vcl/menu.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <com/sun/star/util/XStringWidth.hpp>
 
 #include <vector>
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index c1ffb7a79a0a..b4ea96c1ed4e 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -41,12 +41,12 @@ class SfxTemplateControllerItem;
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include <svtools/svtreebx.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 
 #include <rsc/rscsfx.hxx>
 #include <tools/rtti.hxx>
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index f3c466343205..aecb2c0cf4cb 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -32,7 +32,7 @@
 #define _SFXVIRTMENU_HXX
 
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <sfx2/mnuitem.hxx>
 #include "mnucfga.hxx"
 
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index a8d84187691e..59b9d29c479d 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -42,7 +42,7 @@
 #include <cppuhelper/propshlp.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>     // SvUShorts
+#include <svl/svstdarr.hxx>     // SvUShorts
 #include <rtl/ustring.hxx>
 #include <vos/mutex.hxx>
 
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 9f91c752cf4b..de399eaaa956 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -40,11 +40,11 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #endif
 #include <com/sun/star/task/XInteractionHandler.hpp>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/cancel.hxx>
 #include <unotools/historyoptions.hxx>
-#include <svtools/folderrestriction.hxx>
+#include <svl/folderrestriction.hxx>
 #include <vcl/toolbox.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
@@ -57,8 +57,8 @@
 #endif
 #include <rtl/ustring.hxx>
 
-#include <svtools/itemset.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/itemset.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/asynclink.hxx>
 #include <svtools/inettbc.hxx>
diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx
index 0478fb0ea94b..92454ae62f36 100644
--- a/sfx2/source/layout/sfxtabdialog.cxx
+++ b/sfx2/source/layout/sfxtabdialog.cxx
@@ -37,7 +37,7 @@
 #include <unotools/viewoptions.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 #include "appdata.hxx"
 #include "sfxtypes.hxx"
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 988bbf3b4118..8e403c6bb353 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -51,8 +51,8 @@
 #include <comphelper/processfactory.hxx>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/menuoptions.hxx>
 #include <framework/menuconfiguration.hxx>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 483910b91be0..076932ba9dea 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -60,7 +60,7 @@
 #include <sfx2/mnumgr.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <svtools/menuoptions.hxx>
 
 #include "virtmenu.hxx"
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index ba27fdcd797d..3d88009e7c0e 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -38,7 +38,7 @@
 #include <vcl/menu.hxx>
 #endif
 #ifndef _SXSTRITEM_HXX //autogen
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #endif
 #ifndef GCC
 #endif
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 88c9ba8aa757..beb569ed9a17 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -34,7 +34,7 @@
 #include <sot/factory.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 52a0ac36d3e4..ec542c4af595 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #endif
 #include <tools/urlobj.hxx>
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 #include <sfx2/appuno.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 503995d97b30..df463ac92396 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 #ifndef GCC
 #endif
 #include <com/sun/star/util/URL.hpp>
@@ -57,9 +57,9 @@
 #include <sfx2/sfx.hrc>
 
 #include <comphelper/processfactory.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 9b68499edd68..d65d7022f1df 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -58,12 +58,12 @@
 #include <com/sun/star/ui/XUIFunctionListener.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/imageitm.hxx>
-#include <svtools/visitem.hxx>
-#include <svtools/urlbmk.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/imageitm.hxx>
+#include <svl/visitem.hxx>
+#include <svl/urlbmk.hxx>
 #include <vcl/toolbox.hxx>
 #include <unotools/moduleoptions.hxx>
 
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 42e9a1d04cb6..c88297e477f7 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -43,12 +43,12 @@
 #ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
 #endif
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #ifndef _SPLITWIN_HXX //autogen
 #include <vcl/splitwin.hxx>
 #endif
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index fa0a6fe75d48..b439dca4ffed 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -62,10 +62,10 @@
 
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 #include <vcl/window.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <vos/mutex.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/view/impframe.cxx b/sfx2/source/view/impframe.cxx
index d13beadee9f0..c81b48b20aa2 100644
--- a/sfx2/source/view/impframe.cxx
+++ b/sfx2/source/view/impframe.cxx
@@ -36,7 +36,7 @@
 
 #include "impframe.hxx"
 
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
 
 #include <sfx2/frame.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 21215fa6e730..d0b83ad619af 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -31,7 +31,7 @@
 #ifndef _SFX_IMPFRAME_HXX
 #define _SFX_IMPFRAME_HXX
 
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
 
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>                  // SvBorder
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index a8b57be6714b..3e9989760b11 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -72,7 +72,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include <svtools/soerr.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index ebed00148420..f875143bfab0 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -40,7 +40,7 @@
 #include <svtools/asynclink.hxx>
 
 #include <unotools/printwarningoptions.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 #ifndef GCC
 #endif
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 1a8da1b4179c..f3596de6b1c2 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -60,14 +60,14 @@
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <vcl/menu.hxx>
-#include <svtools/rectitem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/rectitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/asynclink.hxx>
 #include <svtools/sfxecode.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 32151a123539..945419189b78 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -45,12 +45,12 @@
 #include <vcl/splitwin.hxx>
 #endif
 #include <unotools/moduleoptions.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/slstitm.hxx>
-#include <svtools/whiter.hxx>
-#include <svtools/undo.hxx>
+#include <svl/intitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/whiter.hxx>
+#include <svl/undo.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -90,7 +90,7 @@
 #include <basic/sbx.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <svtools/asynclink.hxx>
-#include <svtools/sharecontrolfile.hxx>
+#include <svl/sharecontrolfile.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 4b085737eee7..e4a53a8a6e7a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/view/PrintableState.hpp>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
@@ -43,10 +43,10 @@
 #ifndef _SV_PRNSETUP_HXX //autogen
 #include <svtools/prnsetup.hxx>
 #endif
-#include <svtools/flagitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/intitem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/printwarningoptions.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 7f55a016217e..614a3d43f5db 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -30,12 +30,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
+#include <svl/whiter.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <svtools/sfxecode.hxx>
 #include <svtools/ehdl.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>