9 files changed, 10 insertions, 18 deletions
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index f60699c172e2..b0aee41fc379 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -18,12 +18,12 @@
  */
 
 #include "parametrizedattributedispatcher.hxx"
+#include <editeng/editids.hrc>
 #include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <osl/diagnose.h>
 
-#include <svx/svxids.hrc>
 #include <sfx2/sfxuno.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 810d8e50c860..4cf1f3912f89 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "richtextcontrol.hxx"
+#include <frm_strings.hxx>
 #include <services.hxx>
 
 #include "richtextmodel.hxx"
@@ -29,6 +30,7 @@
 #include <com/sun/star/awt/PosSize.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 94aa8ce54e7c..d79d4c0c74d0 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -23,14 +23,13 @@
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
 #include <tools/wintypes.hxx>
 #include "rtattributes.hxx"
-#include "attributedispatcher.hxx"
+#include "textattributelistener.hxx"
 
 #include <map>
 
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index bf64e94d48a8..437c9abee25e 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -30,7 +30,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
-#include <svl/undo.hxx>
 #include <osl/diagnose.h>
 
 #include <algorithm>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 844ba9d6e119..0634c57f9661 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -23,18 +23,14 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <i18nlangtag/languagetag.hxx>
-#include <editeng/editeng.hxx>
+#include <editeng/editids.hrc>
 #include <editeng/editview.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
-#include <svx/svxids.hrc>
 #include <editeng/scripttypeitem.hxx>
 
-#include <editeng/editobj.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <tools/mapunit.hxx>
-#include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 866b62ae9484..cd00e8032997 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -21,7 +21,11 @@
 #include "richtextengine.hxx"
 #include "richtextunowrapper.hxx"
 
+#include <property.hxx>
+#include <services.hxx>
+
 #include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 2da3bca4f76a..492b08134d20 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -19,21 +19,15 @@
 
 #include "richtextvclcontrol.hxx"
 #include "richtextimplcontrol.hxx"
-#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
-#include <svl/languageoptions.hxx>
 #if OSL_DEBUG_LEVEL > 0
     #include <unotools/ucbstreamhelper.hxx>
     #include <sfx2/filedlghelper.hxx>
     #include <tools/urlobj.hxx>
     #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #endif
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
 #include <osl/diagnose.h>
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 322856619278..9f34f74dc7e7 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
 
 #include <vcl/ctrl.hxx>
-#include <vcl/toolbox.hxx>
-#include <com/sun/star/awt/FontDescriptor.hpp>
 #include "rtattributes.hxx"
 #include "textattributelistener.hxx"
 #include <memory>
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index a45ccca5a502..9617cde6f048 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -19,8 +19,8 @@
 
 #include "specialdispatchers.hxx"
 #include <editeng/editeng.hxx>
+#include <editeng/editids.hrc>
 #include <editeng/editview.hxx>
-#include <svx/svxids.hrc>
 #include <editeng/scriptspaceitem.hxx>
 #include <osl/diagnose.h>