11 files changed, 29 insertions, 28 deletions
diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx
index e4f9e33d4c5f..b60825afbaf0 100644
--- a/svx/inc/svx/unomod.hxx
+++ b/svx/inc/svx/unomod.hxx
@@ -33,10 +33,14 @@
 
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
 #include "svx/svxdllapi.h"
 
 class SdrHint;
 class SdrModel;
+class SdrModel;
+
+SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw();
 
 class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiServiceFactory
 {
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx
index ab18ebe51a6b..bf45a052d20f 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/svx/inc/svx/unotext.hxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -63,16 +64,15 @@
 #include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
+
 #include <svx/editdata.hxx>
 #include <svx/unoedsrc.hxx>
-#include <svx/outliner.hxx>
-#include <svx/unoforou.hxx>
 #include <svx/eeitem.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/unoipset.hxx>
-
 #include <svx/unomid.hxx>
 
+class SvxItemPropertySet;
+
 #ifndef SEQTYPE
  #if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)
   #define SEQTYPE(x) (new ::com::sun::star::uno::Type( x ))
diff --git a/svx/inc/unonrule.hxx b/svx/inc/unonrule.hxx
index b00b4f06cfd9..91a79cf58d51 100644
--- a/svx/inc/unonrule.hxx
+++ b/svx/inc/unonrule.hxx
@@ -42,11 +42,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-class SdrModel;
-//class SvxNumRule;
-
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw();
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
 const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
 bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/svx/source/accessibility/AccessibleEditableTextPara.cxx
index 1bd189856369..cafaf3c25010 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/svx/source/accessibility/AccessibleEditableTextPara.cxx
@@ -63,6 +63,8 @@
 #include <vcl/unohelp.hxx>
 #include <svx/editeng.hxx>
 #include <svx/unoprnms.hxx>
+#include <svx/unoipset.hxx>
+#include <svx/outliner.hxx>
 
 //------------------------------------------------------------------------
 //
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index d683fa21a86d..39cb21f1d2af 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 
 #include <rtl/ref.hxx>
-
+#include <svl/style.hxx>
 #include "svx/sdtaitm.hxx"
 #include "tablemodel.hxx"
 #include "svx/unotext.hxx"
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 8cc81c91065e..74184548abd1 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -41,7 +41,6 @@
 using ::rtl::OUString;
 
 using namespace ::osl;
-using namespace ::vos;
 using namespace ::cppu;
 using namespace ::sdr::table;
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx
index 0dd0927b81a1..f999eab88b97 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/svx/source/unodraw/unonrule.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/graph.hxx>
-
+#include <goodies/grfmgr.hxx>
 #include <toolkit/unohlp.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
diff --git a/svx/source/unoedit/unoedprx.cxx b/svx/source/unoedit/unoedprx.cxx
index a0802cc1a335..c6078619924f 100644
--- a/svx/source/unoedit/unoedprx.cxx
+++ b/svx/source/unoedit/unoedprx.cxx
@@ -58,6 +58,7 @@
 #include <svx/editeng.hxx>
 #include <svx/editview.hxx>
 #include "AccessibleStringWrap.hxx"
+#include <svx/outliner.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx
index 65b5d8030f12..12971244c298 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/svx/source/unoedit/unotext.cxx
@@ -37,28 +37,26 @@
 #include <com/sun/star/text/XTextField.hdl>
 #include <vos/mutex.hxx>
 #include <svl/itemset.hxx>
-
-#include <svx/eeitem.hxx>
 #include <svl/itempool.hxx>
-#include <fontitem.hxx>
-#include <svx/tstpitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
+#include <fontitem.hxx>
+#include <svx/tstpitem.hxx>
 #include <svx/unoprnms.hxx>
 #include <svx/unotext.hxx>
 #include <svx/unoedsrc.hxx>
-#include <svx/unomid.hxx>
 #include "unonrule.hxx"
 #include "unofdesc.hxx"
-#include "unoapi.hxx"
 #include <svx/unofield.hxx>
 #include <svx/flditem.hxx>
-#include <svx/unoshprp.hxx>
 #include <svx/numitem.hxx>
 #include <svx/editeng.hxx>
+#include <svx/outliner.hxx>
+#include <svx/unoipset.hxx>
+#include <svx/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx
index af851e20f8cc..3654b1a6ccd8 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/svx/source/xml/xmltxtexp.cxx
@@ -41,25 +41,25 @@
 #include <svl/itemprop.hxx>
 #include <svl/brdcst.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sfx2/docfile.hxx>
 #include <sot/storage.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <xmloff/xmluconv.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include "xmloff/nmspmap.hxx"
-#include "xmloff/xmlmetae.hxx"
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlmetae.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <svx/editeng.hxx>
-#include "xmloff/xmlexp.hxx"
+#include <xmloff/xmlexp.hxx>
 #include <svx/unoedsrc.hxx>
 #include <svx/unofored.hxx>
 #include <svx/unotext.hxx>
-#include "editsource.hxx"
 #include <svx/unoprnms.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <svx/unofield.hxx>
+#include <svx/editeng.hxx>
+#include "editsource.hxx"
 #include "unonrule.hxx"
+#include <svx/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::container;
diff --git a/svx/source/xml/xmltxtimp.cxx b/svx/source/xml/xmltxtimp.cxx
index 025c0ec096af..9b54c901f39d 100644
--- a/svx/source/xml/xmltxtimp.cxx
+++ b/svx/source/xml/xmltxtimp.cxx
@@ -40,18 +40,19 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <svx/editeng.hxx>
 #include <sot/storage.hxx>
 #include <svl/itemprop.hxx>
 #include <xmloff/xmlimp.hxx>
-#include "xmloff/xmlmetae.hxx"
+#include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "editsource.hxx"
+#include <svx/editeng.hxx>
 #include <svx/unotext.hxx>
 #include <svx/unoprnms.hxx>
+#include <svx/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::document;