Cleanup some unnecessary #include

15 files changed, 7 insertions, 13 deletions

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 98247b916614..f235ffa8d794 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 
 #include <svtools/controldims.hrc>
+#include <svtools/valueset.hxx>
 // header for class Image
 #include <vcl/image.hxx>
 // header for class Bitmap
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 787189149fb7..d0af40a64970 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/chart2/CurveStyle.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
-#include <svtools/valueset.hxx>
 // header for class CheckBox
 #include <vcl/button.hxx>
 // header for class FixedText
@@ -45,6 +44,8 @@
 #include <vcl/field.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
+class ValueSet;
+
 //.............................................................................
 namespace chart
 {
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 74ee6de625fe..747bac279952 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -32,7 +32,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/valueset.hxx>
 #include <svl/itemset.hxx>
 #include <svx/chrtitem.hxx>
 #include "chartview/ChartSfxItemIds.hxx"
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index b2de3205981d..e5b8a6cb283e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -35,7 +35,6 @@
 #include <dialmgr.hxx>
 #include <tools/shl.hxx>
 #include <i18npool/mslangid.hxx>
-#include <svtools/valueset.hxx>
 #include <helpid.hrc>
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 724ea2f8e8df..bbe7e3b29ca2 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -58,6 +58,7 @@
 #include <vcl/bmpacc.hxx>
 #include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
+#include <svtools/valueset.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index aa34d461fc46..b05a1ecb8a90 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -37,8 +37,6 @@
 
 #include <svx/fntctrl.hxx>
 
-#include <svtools/valueset.hxx>
-
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 2d3933a92045..76f3b5a76238 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -38,7 +38,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
-#include <svtools/valueset.hxx>
 
 #include <svx/svdetc.hxx>
 #include <svx/svdstr.hrc>
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 1817c482b922..2c4a9299698f 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -52,6 +52,7 @@
 #include <svx/sdr/table/tabledesign.hxx>
 
 #include "TableDesignPane.hxx"
+#include <svtools/valueset.hxx>
 
 #include "DrawDocShell.hxx"
 #include "ViewShellBase.hxx"
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 37ffe1d1ea66..5df94d9825c8 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -37,7 +37,6 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <svtools/valueset.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
index d542fe49d906..4002cbcd79b5 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
@@ -43,7 +43,6 @@
 #include "strings.hrc"
 #include "sdresid.hxx"
 #include "helpids.h"
-#include <svtools/valueset.hxx>
 #include "app.hrc"
 
 namespace sd { namespace toolpanel { namespace controls {
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index e4874836765f..9a1cdc1890cc 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -48,8 +48,6 @@
 
 #include "framestatuslistener.hxx"
 
-#include "svtools/valueset.hxx"
-
 namespace svtools {
 
 struct ToolbarMenu_Impl;
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 576965759172..380c77de5f8c 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -34,7 +34,6 @@
 #include <vcl/field.hxx>
 #include <sfx2/dockwin.hxx>
 #include <vcl/button.hxx>
-#include <svtools/valueset.hxx>
 #include <svtools/stdctrl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index b9953f9c814a..3da4fe96709a 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -30,7 +30,6 @@
 #include <comphelper/string.hxx>
 #include <sot/formats.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/valueset.hxx>
 #include <svl/urlbmk.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 641e3db70ef5..1b033ab36d8c 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -6,6 +6,7 @@
 #define __SVX_COLORWINDOW_HXX_
 
 #include <sfx2/tbxctrl.hxx>
+#include <svtools/valueset.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 35993c461beb..5ff022bd0cf5 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -30,7 +30,6 @@
 
 #include "svx/svxdllapi.h"
 
-#include <svtools/valueset.hxx>
 #include <svtools/svtreebx.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
@@ -43,6 +42,7 @@
 
 class SfxBindings;
 class SfxStatusForwarder;
+class ValueSet;
 
 //========================================================================