#i103496#: make svl buildable with internal inc/svl directory

41 files changed, 84 insertions, 84 deletions

diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 54ce914d09fe..55dc818d0160 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -36,9 +36,9 @@
 #include <tools/string.hxx>
 
 #define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/svarray.hxx>
+#include <svl/aeitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/bintitem.cxx b/svl/source/items/bintitem.cxx
index 1ee0ebe224e1..5236f36504f8 100644
--- a/svl/source/items/bintitem.cxx
+++ b/svl/source/items/bintitem.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
 #include <tools/bigint.hxx>
-#include <svtools/bintitem.hxx>
+#include <svl/bintitem.hxx>
 
 // STATIC DATA
 
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 65cc4a78be54..3c2f7764a351 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
-#include <svtools/cenumitm.hxx>
+#include <svl/cenumitm.hxx>
 #include <whassert.hxx>
 
 #ifndef _CPPUHELPER_EXTRACT_HXX_
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index a20c947b56de..9d9d58421fc4 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svl.hxx"
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
-#include <svtools/cintitem.hxx>
+#include <svl/cintitem.hxx>
 
 //============================================================================
 //
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 5d4941981ec4..824ad6b2b5b0 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -36,7 +36,7 @@
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 
-#include <svtools/cntwall.hxx>
+#include <svl/cntwall.hxx>
 
 #define CNTWALLPAPERITEM_STREAM_MAGIC   ( (UINT32)0xfefefefe )
 #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( UINT32 ) ) ) )
diff --git a/svl/source/items/cstitem.cxx b/svl/source/items/cstitem.cxx
index eb9092828060..af2bfbc18fb9 100644
--- a/svl/source/items/cstitem.cxx
+++ b/svl/source/items/cstitem.cxx
@@ -38,10 +38,10 @@
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
 
-#include <svtools/svldata.hxx>
-#include <svtools/cstitem.hxx>
+#include <svl/svldata.hxx>
+#include <svl/cstitem.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <com/sun/star/lang/Locale.hpp>
 
 DBG_NAME( SfxCrawlStatusItem )
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
index 8d6e2d0280c0..b25b980e39cf 100644
--- a/svl/source/items/cstitem.src
+++ b/svl/source/items/cstitem.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 String STR_CSTAT_NEVER_UPD
 {
     Text [ en-US ] = "No update has occurred" ;
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index a5c12d49dda5..69302ebdb868 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -34,7 +34,7 @@
 
 #include <unotools/intlwrapper.hxx>
 #include <tools/stream.hxx>
-#include <svtools/ctypeitm.hxx>
+#include <svl/ctypeitm.hxx>
 
 //============================================================================
 // The following defines are copied from chaos/source/items/cstritem.cxx:
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 5e2be8469922..8687aafbae49 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -34,7 +34,7 @@
 
 #include <unotools/intlwrapper.hxx>
 #include <tools/stream.hxx>
-#include <svtools/custritm.hxx>
+#include <svl/custritm.hxx>
 
 //============================================================================
 //
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 5ce66349c0a3..7f901dac9cd8 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -34,7 +34,7 @@
 // include ---------------------------------------------------------------
 
 #define _DATETIMEITEM_CXX
-#include <svtools/dateitem.hxx>
+#include <svl/dateitem.hxx>
 
 #include <unotools/intlwrapper.hxx>
 #include <comphelper/processfactory.hxx>
@@ -50,8 +50,8 @@
 
 #include <vcl/svapp.hxx>
 
-#include <svtools/svldata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svldata.hxx>
+#include <svl/svtools.hrc>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/dtritem.cxx b/svl/source/items/dtritem.cxx
index 5159631f713a..32a7fdc1c60d 100644
--- a/svl/source/items/dtritem.cxx
+++ b/svl/source/items/dtritem.cxx
@@ -43,7 +43,7 @@
 
 #include <vcl/svapp.hxx>
 
-#include <svtools/dtritem.hxx>
+#include <svl/dtritem.hxx>
 
 
 DBG_NAME( SfxDateTimeRangeItem )
diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx
index 1dc137f32467..16d5aae5a16f 100644
--- a/svl/source/items/eitem.cxx
+++ b/svl/source/items/eitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 //============================================================================
 //
 //  class SfxEnumItem
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index e2e0bd55f919..537632db04ff 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/flagitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/flagitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/frqitem.cxx b/svl/source/items/frqitem.cxx
index b7d47e4e3ac9..cfa1db17ef65 100644
--- a/svl/source/items/frqitem.cxx
+++ b/svl/source/items/frqitem.cxx
@@ -39,7 +39,7 @@
 #include <tools/debug.hxx>
 #include <tools/datetime.hxx>
 
-#include <svtools/frqitem.hxx>
+#include <svl/frqitem.hxx>
 
 DBG_NAME( SfxFrequencyItem )
 
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index e8beb9a62b9e..1b676a95bf71 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -38,7 +38,7 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/globalnameitem.hxx>
+#include <svl/globalnameitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 3d600632118f..4d2cb0a3b5b9 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -35,10 +35,10 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <svtools/ilstitem.hxx>
+#include <svl/ilstitem.hxx>
 
 #define _SVSTDARR_ULONGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 
 TYPEINIT1_AUTOFACTORY(SfxIntegerListItem, SfxPoolItem);
 
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 276e7445ae3f..dec2626472cc 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/imageitm.hxx>
+#include <svl/imageitm.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 TYPEINIT1( SfxImageItem, SfxInt16Item );
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 245e9734aa89..1133cdf553d1 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -31,11 +31,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/bigint.hxx>
 #include <tools/stream.hxx>
-#include <svtools/metitem.hxx>
+#include <svl/metitem.hxx>
 
 //============================================================================
 //
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index 3bd616054149..c8c6eea67c82 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -34,9 +34,9 @@
 #ifndef GCC
 #endif
 
-#include <svtools/itemiter.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 50f5c1fee817..5f34560e8471 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -36,10 +36,10 @@
 #ifndef GCC
 #endif
 
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "whassert.hxx"
-#include <svtools/brdcst.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/smplhint.hxx>
 #include "poolio.hxx"
 #include <algorithm>
 
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index cf2677dd988c..cd50c1c51794 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -31,9 +31,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/itemprop.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemprop.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <hash_map>
 /*************************************************************************
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 05873c0d5b41..45516660ee21 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -43,12 +43,12 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 
-#include <svtools/svstdarr.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/itemiter.hxx>
+#include <svl/svstdarr.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemiter.hxx>
 #include "whiter.hxx"
-#include <svtools/nranges.hxx>
+#include <svl/nranges.hxx>
 #include "whassert.hxx"
 
 #include <tools/stream.hxx>
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 695a80ecf0a4..04e2edb70026 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -32,8 +32,8 @@
 #include "precompiled_svl.hxx"
 
 #define _LCKBITEM_CXX
-#include <svtools/lckbitem.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/lckbitem.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/cachestr.hxx>
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 4837f9cb88e0..511ca2bba57c 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -35,7 +35,7 @@
 #ifndef GCC
 #endif
 
-#include <svtools/macitem.hxx>
+#include <svl/macitem.hxx>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 634b1cae1c14..e64325213ff4 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -36,8 +36,8 @@
 #ifndef GCC
 #endif
 
-#include <svtools/itempool.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itempool.hxx>
+#include <svl/itemset.hxx>
 #include "poolcach.hxx"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index bee7bc04ae23..4383ac99d2ed 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -38,11 +38,11 @@
 #endif
 
 #include <tools/solar.h>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
 #include "whassert.hxx"
-#include <svtools/brdcst.hxx>
-#include <svtools/filerec.hxx>
-#include <svtools/svldata.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/filerec.hxx>
+#include <svl/svldata.hxx>
 #include "poolio.hxx"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 8946175a0dd2..4957c5c16945 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include <tools/stream.hxx>
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 5d8497dd0ada..30fef0227397 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -31,12 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/ptitem.hxx>
+#include <svl/ptitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 using namespace ::com::sun::star;
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index e88d2886b7c0..26c4876d8c2c 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -31,12 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/rectitem.hxx>
+#include <svl/rectitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 17ff38a01382..b6340d662112 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -37,13 +37,13 @@
 #define NUMTYPE USHORT
 #define SfxXRangeItem SfxRangeItem
 #define SfxXRangesItem SfxUShortRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #include "rngitem_inc.cxx"
 
 #define NUMTYPE sal_uInt32
 #define SfxXRangeItem SfxULongRangeItem
 #define SfxXRangesItem SfxULongRangesItem
-#include <svtools/rngitem.hxx>
+#include <svl/rngitem.hxx>
 #include "rngitem_inc.cxx"
 
 #else
diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index 6413cbc8d1cc..9ec06bc5a105 100644
--- a/svl/source/items/sfontitm.cxx
+++ b/svl/source/items/sfontitm.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svl.hxx"
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <svtools/sfontitm.hxx>
+#include <svl/sfontitm.hxx>
 
 //============================================================================
 //
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 04ae8becfde0..52f0931c9eae 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -38,8 +38,8 @@
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
 
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 12b2aa2dbd4b..d0dd801bb6f9 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -31,8 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/slstitm.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/slstitm.hxx>
+#include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <tools/stream.hxx>
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 4b24b5712fe1..5f6b692106a3 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
 
 //============================================================================
 //
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 68bae3f8142e..7ed44f7a9694 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -43,15 +43,15 @@
 #include <tools/tenccvt.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/intlwrapper.hxx>
-#include <svtools/smplhint.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/itemset.hxx>
+#include <svl/itempool.hxx>
 #include <poolio.hxx>
-#include <svtools/filerec.hxx>
-#include <svtools/itemiter.hxx>
-#include <svtools/style.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/filerec.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/style.hxx>
+#include <svl/svstdarr.hxx>
 #include <vcl/svapp.hxx>
 
 #include <algorithm>
@@ -702,11 +702,11 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Create( const SfxStyleSheetBase& r )
 
 SfxStyleSheetBase& SfxStyleSheetBasePool::Make( const XubString& rName, SfxStyleFamily eFam, USHORT mask, USHORT nPos)
 {
-    DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svtools::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" );
+    DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svl::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" );
 
     SfxStyleSheetIterator aIter(this, eFam, mask);
     rtl::Reference< SfxStyleSheetBase > xStyle( aIter.Find( rName ) );
-    DBG_ASSERT( !xStyle.is(), "svtools::SfxStyleSheetBasePool::Make(), StyleSheet already exists" );
+    DBG_ASSERT( !xStyle.is(), "svl::SfxStyleSheetBasePool::Make(), StyleSheet already exists" );
     SfxStyleSheetIterator& rIter = GetIterator_Impl();
 
     if( !xStyle.is() )
@@ -820,15 +820,15 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 
 void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
 {
-    DBG_ASSERT( p, "svtools::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
+    DBG_ASSERT( p, "svl::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
 
     SfxStyleSheetIterator aIter(this, p->GetFamily(), p->GetMask());
     SfxStyleSheetBase* pOld = aIter.Find( p->GetName() );
-    DBG_ASSERT( !pOld, "svtools::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" );
+    DBG_ASSERT( !pOld, "svl::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" );
     if( p->GetParent().Len() )
     {
         pOld = aIter.Find( p->GetParent() );
-        DBG_ASSERT( pOld, "svtools::SfxStyleSheetBasePool::Insert(), Parent not found!" );
+        DBG_ASSERT( pOld, "svl::SfxStyleSheetBasePool::Insert(), Parent not found!" );
     }
     aStyles.push_back( rtl::Reference< SfxStyleSheetBase >( p ) );
     Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 5f31500be73c..57ba991afcb4 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -36,8 +36,8 @@
 #include <map>
 
 #include "stylepool.hxx"
-#include <svtools/itemiter.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itemiter.hxx>
+#include <svl/itempool.hxx>
 
 
 using namespace boost;
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index de18e13b04d7..a7667a25a97c 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#include <svtools/szitem.hxx>
+#include <svl/szitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <tools/stream.hxx>
 #include <tools/gen.hxx>
 
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
 #include "memberid.hrc"
 
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/tfrmitem.cxx b/svl/source/items/tfrmitem.cxx
index d4909aca049c..636b3e9eb0a1 100644
--- a/svl/source/items/tfrmitem.cxx
+++ b/svl/source/items/tfrmitem.cxx
@@ -36,7 +36,7 @@
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
 
-#include <svtools/tfrmitem.hxx>
+#include <svl/tfrmitem.hxx>
 
 DBG_NAME( SfxTargetFrameItem )
 TYPEINIT1( SfxTargetFrameItem, SfxPoolItem );
diff --git a/svl/source/items/tresitem.cxx b/svl/source/items/tresitem.cxx
index 4ad6fa3c1b77..3fdf3f750180 100644
--- a/svl/source/items/tresitem.cxx
+++ b/svl/source/items/tresitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include <svtools/tresitem.hxx>
+#include <svl/tresitem.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index a4f10b98303c..e4ff302541fe 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-#include <svtools/visitem.hxx>
+#include <svl/visitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
 
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index 4b582900d152..b5e53e0bc278 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -35,7 +35,7 @@
 #endif
 
 #include "whiter.hxx"
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
 
 DBG_NAME(SfxWhichIter)