13 files changed, 12 insertions, 14 deletions

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 50808b5825da..11939212e5cd 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -24,6 +24,7 @@
 
 #include <unotools/lingucfg.hxx>
 #include <editeng/langitem.hxx>
+#include <svl/itempool.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 53ddfb1c4aa9..7e791de8eac4 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_ITEMCONVERTER_HXX
 
 #include <unotools/eventlisteneradapter.hxx>
-#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index c889873d751f..a462d20cf88f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -21,6 +21,7 @@
 #include "macros.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 #include <osl/diagnose.h>
+#include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 12fc658f6d03..1e0f0d48d437 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -109,6 +109,7 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <svl/itempool.hxx>
 #include <svl/languageoptions.hxx>
 #include <comphelper/classids.hxx>
 #include "servicenames_charttypes.hxx"
diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx
index c9ae8db630fc..8938a909f15c 100644
--- a/cui/source/inc/cuiimapwnd.hxx
+++ b/cui/source/inc/cuiimapwnd.hxx
@@ -20,16 +20,12 @@
 #define INCLUDED_CUI_SOURCE_INC_CUIIMAPWND_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menu.hxx>
-#include <svl/itempool.hxx>
-#include <svtools/imapobj.hxx>
-#include <svtools/transfer.hxx>
-#include <svtools/imap.hxx>
+#include <vcl/vclmedit.hxx>
+
 #include <sfx2/frame.hxx>
-#include <svtools/svmedit.hxx>
 
 class URLDlg : public ModalDialog
 {
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 3c9e79d25576..ba8ac1d02bcd 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_CUI_SOURCE_INC_ICONCDLG_HXX
 
 #include <rtl/ustring.hxx>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
 #include <svtools/ivctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/msgbox.hxx>
@@ -36,6 +34,8 @@
 struct IconChoicePageData;
 class IconChoiceDialog;
 class IconChoicePage;
+class SfxItemPool;
+class SfxItemSet;
 
 // Create-Function
 typedef VclPtr<IconChoicePage> (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet);
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 6c7c58f9ff78..b0a6318e45ea 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -27,6 +27,7 @@
 
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/guarding.hxx>
+#include <svl/itempool.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <editeng/editstat.hxx>
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index fdd7eb89c1d6..8094d0509604 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -28,7 +28,6 @@
 #include <vcl/mapmod.hxx>
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/itempool.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editeng.hxx>
 
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index a9b42bdb8341..179a3a621994 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -53,7 +53,6 @@
 #include <tools/link.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
 #include <svl/solar.hrc>
 #include <editeng/editdata.hxx>
 #include <editeng/unoedsrc.hxx>
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 84afcfae62b6..758f1eb6bddc 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -22,7 +22,6 @@
 #include <vcl/window.hxx>
 #include <editeng/svxfont.hxx>
 #include <svx/svxdllapi.h>
-#include <svl/itempool.hxx>
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index c99f9859c53c..33035b0444e1 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_NUMINF_HXX
 #define INCLUDED_SVX_NUMINF_HXX
 
-#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/numfmtsh.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 9f1d29074e8f..27e62a763ddb 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -23,7 +23,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menu.hxx>
-#include <svl/itempool.hxx>
 #include <svtools/imapobj.hxx>
 #include <svtools/transfer.hxx>
 #include <svtools/imap.hxx>
@@ -32,6 +31,8 @@
 
 #include <com/sun/star/frame/XFrame.hpp>
 
+struct SfxItemInfo;
+
 struct NotifyInfo
 {
     OUString    aMarkURL;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 0d3ad2967104..e68ab9f25dc8 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>