tdf#42949 Fix IWYU warnings in reportdesign/*/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: If8549e62de1007fccf9a5becac356f8d1ffc5090
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92513
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

79 files changed, 67 insertions, 146 deletions

diff --git a/reportdesign/IwyuFilter_reportdesign.yaml b/reportdesign/IwyuFilter_reportdesign.yaml
new file mode 100644
index 000000000000..b62ac641b545
--- /dev/null
+++ b/reportdesign/IwyuFilter_reportdesign.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: reportdesign/source/ui/report/ReportController.cxx
+blacklist:
+    reportdesign/inc/RptDef.hxx:
+    # Needed for macro define
+    - svx/fmglob.hxx
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 49dd3b4ac0fa..50973000d493 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 33de83b9e1a5..2876e97c8c19 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -28,7 +28,7 @@
 #include "dllapi.h"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svx/fmglob.hxx>
-#include <svx/svdobj.hxx>
+#include <svx/svdtypes.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace report {
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index ee884efd3f77..652ae055af8c 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -26,11 +26,8 @@
 
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>
 #include <com/sun/star/report/XSection.hpp>
-#include <svx/svdocirc.hxx>
-#include <svx/svdogrp.hxx>
 #include <svx/svdoashp.hxx>
 
 #include <map>
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index ad7277d5b652..1764f27ffb33 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -21,19 +21,11 @@
 
 #include "dllapi.h"
 
-#include "RptModel.hxx"
-
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XGroup.hpp>
-#include <com/sun/star/document/XUndoManager.hpp>
 
-#include <svl/lstner.hxx>
-#include <svx/svdouno.hxx>
 #include <svx/svdundo.hxx>
 
 #include <functional>
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index b0f3b863534a..e4630dbb02b2 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -22,10 +22,14 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/report/XSection.hpp>
 
-#include <cppuhelper/compbase.hxx>
 #include <memory>
 #include <svl/lstner.hxx>
+#include "dllapi.h"
+#include "RptPage.hxx"
 
 namespace rptui
 {
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index 39af986cf1d7..95dc0019af70 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
 #define INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
 
-#include <svx/svxids.hrc>
+#include <svl/solar.hrc>
 
 #define SID_PAGEHEADERFOOTER                    ( SID_RPTUI_START +   0 )
 #define SID_REPORTHEADERFOOTER                  ( SID_RPTUI_START +   1 )
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index 9885ce5791c1..9c75d7490c86 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -20,6 +20,7 @@
 #include <Function.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <algorithm>
 
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index e925bac26b6c..d55e503d8234 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -27,6 +27,7 @@
 #include <core_resource.hxx>
 #include <Tools.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/types.hxx>
 #include <Functions.hxx>
 
 
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index 0b50c4025bd0..c13b326f5dc3 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -19,6 +19,7 @@
 #include <ReportControlModel.hxx>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 namespace reportdesign
 {
 using namespace com::sun::star;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index fe91c466c337..ab6c71fc1670 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -63,6 +63,7 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/report/GroupKeepTogether.hpp>
 #include <com/sun/star/report/ReportPrintOption.hpp>
@@ -107,6 +108,7 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <comphelper/types.hxx>
 #include <dbaccess/dbaundomanager.hxx>
 #include <editeng/paperinf.hxx>
 #include <framework/titlehelper.hxx>
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index 4b27adee20d1..bf067c8068be 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -22,8 +22,8 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/report/XFunction.hpp>
+#include <com/sun/star/report/XFunctions.hpp>
 #include <cppuhelper/basemutex.hxx>
-#include "ReportControlModel.hxx"
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 935e50647101..1c5a1ef3c8f8 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/report/XFormatCondition.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <comphelper/interfacecontainer2.hxx>
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 2347bd702b4d..951dc93ce168 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -21,18 +21,13 @@
 
 #include <sal/config.h>
 
-#include <map>
-
 #include <com/sun/star/report/XReportEngine.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <rtl/ref.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index d6f3676b0239..d27a4bf3315d 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
 
 namespace rptui
 {
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 77a92db780bd..0fca2067c5f9 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/types.hxx>
 #include <cppuhelper/propertysetmixin.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -33,7 +32,6 @@
 #include <com/sun/star/form/XFormsSupplier2.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <rtl/ref.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 80146d796635..004d4cc4f77a 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -23,12 +23,12 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 
-#include "Section.hxx"
 #include <strings.hxx>
+#include <osl/diagnose.h>
+#include <comphelper/uno3.hxx>
 
 namespace reportdesign
 {
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index 80414044f41d..2f64334d856f 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -18,24 +18,22 @@
  */
 #include "dbloader2.hxx"
 #include <tools/urlobj.hxx>
+#include <comphelper/documentconstants.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace rptxml
 {
 
-using namespace ::ucbhelper;
-using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::document;
-using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::ui::dialogs;
 
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 08703a776845..59da948ef826 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -20,35 +20,10 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_DBLOADER2_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_DBLOADER2_HXX
 
-#include <toolkit/awt/vclxwindow.hxx>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/sdb/XDocumentDataSource.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/container/XSet.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <vcl/svapp.hxx>
-#include <ucbhelper/content.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include <comphelper/documentconstants.hxx>
-#include <comphelper/types.hxx>
-#include <osl/file.hxx>
-#include <sfx2/docfile.hxx>
-#include <unotools/moduleoptions.hxx>
 
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
index 0a52a2233466..4f0643878d6a 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx
@@ -21,8 +21,6 @@
 
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlaustp.hxx>
-#include <xmloff/xmltypes.hxx>
-#include <xmloff/xmlprmap.hxx>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 1ea03cd47a11..d61de6a70318 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -27,10 +27,12 @@
 #include "xmlEnums.hxx"
 #include "xmlStyleImport.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFixedLine.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <strings.hxx>
 #include "xmlTable.hxx"
 #include "xmlFormattedField.hxx"
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index b269143356f5..bc97551de846 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx
index 27b76ff796b9..83216bf91a83 100644
--- a/reportdesign/source/filter/xml/xmlComponent.hxx
+++ b/reportdesign/source/filter/xml/xmlComponent.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 63c7649bcb52..e4f4fb9a39b4 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -26,6 +26,7 @@
 #include "xmlComponent.hxx"
 #include <strings.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index b4d6175f400e..3fa9d751c379 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #define TYPE_DATE       1
 #define TYPE_TIME       2
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 5db11193c8e9..312ef03c5cb8 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -54,6 +54,7 @@
 #include <RptDef.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/macros.h>
+#include <osl/diagnose.h>
 
 #include <iterator>
 
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 363910bf6cec..baf4fc401d84 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -23,23 +23,16 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XSection.hpp>
 #include <com/sun/star/report/XReportControlModel.hpp>
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <osl/diagnose.h>
-#include <unotools/tempfile.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlexppr.hxx>
+#include <xmloff/prhdlfac.hxx>
+#include <xmloff/xmlprmap.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <memory>
 
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 805a15edb3bd..f8c45e59e08c 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -26,11 +26,13 @@
 #include "xmlReportElement.hxx"
 #include "xmlCell.hxx"
 #include <strings.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/report/XFixedText.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include "xmlTable.hxx"
 #include <xmloff/XMLCharContext.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 8baf242e62fa..916b61fed701 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFIXEDCONTENT_HXX
 
 #include "xmlReportElementBase.hxx"
-#include <com/sun/star/drawing/XShapes.hpp>
 
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 849292ec6ab6..15532e27e718 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -29,6 +29,7 @@
 #include <strings.hxx>
 #include "xmlStyleImport.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 0b2fb71a4443..348f9858c4cc 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -28,6 +28,7 @@
 #include "xmlReportElement.hxx"
 #include "xmlComponent.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 8a8787c6c4b1..e933e603d2ac 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -25,6 +25,7 @@
 #include "xmlEnums.hxx"
 #include <strings.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index bf596ed7245c..efdd2ba7179b 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLFUNCTION_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/report/XFunctionsSupplier.hpp>
 #include <com/sun/star/report/XFunctions.hpp>
 
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 570ed1a75e0a..35582b3d6907 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/report/GroupOn.hpp>
 #include <com/sun/star/report/KeepTogether.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index 70eeb22db992..ac1ba4e530ed 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLGROUP_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/report/XGroups.hpp>
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index b23ebbdd4d65..3a9ec4668e2a 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -22,7 +22,7 @@
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/contextid.hxx>
 #include <xmloff/controlpropertyhdl.hxx>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <memory>
 
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index fc1ee6e84fcf..a88091570873 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -29,6 +29,7 @@
 #include "xmlHelper.hxx"
 #include <unotools/pathoptions.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
index ffc4499c689f..5ca92d9c1332 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLPROPERTYHANDLER_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLPROPERTYHANDLER_HXX
 
-#include <xmloff/xmlprmap.hxx>
-#include <xmloff/contextid.hxx>
 #include <xmloff/prhdlfac.hxx>
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index b4d80b42490c..9e6fdf902ae2 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -27,7 +27,7 @@
 #include "xmlCondPrtExpr.hxx"
 #include "xmlFormatCondition.hxx"
 #include <sal/log.hxx>
-
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index b7fe4f4950e8..15b35a927b05 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -24,6 +24,7 @@
 #include "xmlReportElement.hxx"
 #include "xmlEnums.hxx"
 #include "xmlTable.hxx"
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index 9d4f03f25b4e..0d06e0717962 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -21,7 +21,6 @@
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XReportComponent.hpp>
-#include <vector>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index fd84df264dfa..129ea3751141 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -32,6 +32,7 @@
 #include <strings.hxx>
 #include "xmlTable.hxx"
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 797cc3df55a9..beed05c9870f 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -21,7 +21,6 @@
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/report/XSection.hpp>
-#include <vector>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index ae6b578ee0b0..b30a67cf2b43 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "xmlStyleImport.hxx"
+#include <xmloff/maptype.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlimppr.hxx>
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 4262d91d6dc1..4353bd33d951 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -21,16 +21,8 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
 
 #include <rtl/ustring.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <xmloff/xmlictxt.hxx>
-#include <xmloff/maptype.hxx>
 #include <xmloff/prstylei.hxx>
 #include <xmloff/xmlimppr.hxx>
-#include <xmloff/XMLTextMasterPageContext.hxx>
-#include <xmloff/XMLTextMasterStylesContext.hxx>
-#include <xmloff/contextid.hxx>
-#include <xmloff/controlpropertyhdl.hxx>
-#include <vector>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 041cd7a44406..89f2527d0e81 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -28,6 +28,7 @@
 #include "xmlTable.hxx"
 #include <comphelper/property.hxx>
 #include <com/sun/star/report/XReportControlModel.hpp>
+#include <osl/diagnose.h>
 
 namespace rptxml
 {
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 06d03c996e86..f7f376cdaf81 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/report/XShape.hpp>
 #include <com/sun/star/report/XFixedLine.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <numeric>
 
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index ddd4a6a28dad..09ad670a3570 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -51,6 +51,7 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
+#include <xmloff/XMLTextMasterStylesContext.hxx>
 #include <sfx2/docfile.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/uno/XNamingService.hpp>
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 25202e2fd6c9..eb1b8f715e36 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -22,17 +22,8 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
-#include <osl/diagnose.h>
-#include <unotools/tempfile.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <map>
diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx
index a824edfec8a3..873a08038cd8 100644
--- a/reportdesign/source/inc/GroupProperties.hxx
+++ b/reportdesign/source/inc/GroupProperties.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_GROUPPROPERTIES_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_INC_GROUPPROPERTIES_HXX
 
+#include <rtl/ustring.hxx>
+
 namespace rptshared
 {
     /** struct for the group properties
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index d68e201c80a9..30cf2aa96eac 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -22,6 +22,7 @@
 #include <connectivity/dbconversion.hxx>
 #include <unotools/syslocale.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <vcl/svapp.hxx>
 #include <UITools.hxx>
 #include <RptDef.hxx>
 #include <strings.hxx>
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index a3017a6a7069..3465bcdd971f 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -19,12 +19,12 @@
 #include "GroupExchange.hxx"
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
+#include <osl/diagnose.h>
 
 namespace rptui
 {
     using namespace ::com::sun::star;
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::beans;
 
     SotClipboardFormatId OGroupExchange::getReportGroupId()
     {
diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx
index b2fad269dbd2..6154e75ae480 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.hxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_DLG_GROUPEXCHANGE_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/transfer.hxx>
-#include <GroupsSorting.hxx>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index bd3ad95fa456..5d4bfca8a140 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/property.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 #include <algorithm>
 
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index ce2120c97fa6..187b8be7d408 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -39,12 +39,14 @@
 #include <comphelper/containermultiplexer.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/SelectionMultiplex.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/commandevent.hxx>
 #include <svl/solar.hrc>
 #include <ReportVisitor.hxx>
 #include <core_resource.hxx>
 #include <rtl/ref.hxx>
+#include <svx/svxids.hrc>
 
 #include <memory>
 #include <algorithm>
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index b348fcd32916..db255fd4fd54 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -30,7 +30,6 @@
 #include <svx/dbaexchange.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include <vcl/transfer.hxx>
 #include <vcl/weld.hxx>
 
 #include <rtl/ref.hxx>
diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx
index 16cf429f24f5..bbed0a0c1273 100644
--- a/reportdesign/source/ui/inc/ColorChanger.hxx
+++ b/reportdesign/source/ui/inc/ColorChanger.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_COLORCHANGER_HXX
 
+#include <vcl/outdev.hxx>
+
 namespace rptui
 {
 
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index f36c39400c5c..657f900b7b69 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -33,8 +33,6 @@
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <memory>
-
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 8116986cb608..e740112e5c7b 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase3.hxx>
 
-#include <memory>
-
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index a8c979879711..60ee506da7f7 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -22,19 +22,12 @@
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/report/XSection.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>
-#include <vcl/split.hxx>
-#include <vcl/scrbar.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
-#include <svl/hint.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include "ReportDefines.hxx"
-#include <svtools/colorcfg.hxx>
-#include <svx/svdedtv.hxx>
 #include <vcl/splitwin.hxx>
 #include "MarkedSection.hxx"
 #include "ScrollHelper.hxx"
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 6c0f1d88cc7b..fa76a52dfe2b 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -21,15 +21,12 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FIXEDTEXTCOLOR_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/report/XFixedText.hpp>
 #include <tools/color.hxx>
 
 #include "IReportControllerObserver.hxx"
-#include <vector>
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index 7a31cff99501..455dfd396d75 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -21,12 +21,10 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_FORMATTEDFIELDBEAUTIFIER_HXX
 
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/report/XReportComponent.hpp>
 #include <tools/color.hxx>
 
-#include <vector>
 #include "IReportControllerObserver.hxx"
 
 namespace rptui
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 9a53927e219a..d4520e210348 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -33,10 +33,10 @@
 #include <com/sun/star/report/XFunctionsSupplier.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
+#include <map>
 #include <memory>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/listenernotification.hxx>
-#include "metadata.hxx"
 
 
 namespace rptui
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 405c5c0bc2a3..270484a19b3c 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -22,15 +22,12 @@
 #include <com/sun/star/report/XGroups.hpp>
 #include <com/sun/star/report/XGroup.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <GroupProperties.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>
 
-#include <vector>
-
 class Control;
 
 namespace comphelper
diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx
index 3076ebf7cbd8..2d97645c4e86 100644
--- a/reportdesign/source/ui/inc/MarkedSection.hxx
+++ b/reportdesign/source/ui/inc/MarkedSection.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_MARKEDSECTION_HXX
 
+#include <sal/types.h>
+
 namespace rptui
 {
     class OSectionWindow;
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 98ea53743c4e..3a329c58d2eb 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/inspection/XPropertyHandler.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <memory>
-
 
 namespace rptui
 {
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index b045d7f8ab1c..a6fc9f155039 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -25,16 +25,12 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/io/XObjectInputStream.hpp>
-#include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/report/XReportDefinition.hpp>
 #include <com/sun/star/report/XReportEngine.hpp>
 #include <com/sun/star/report/XSection.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -50,7 +46,6 @@
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 #include <svl/lstner.hxx>
 #include <vcl/transfer.hxx>
-#include <svx/svdedtv.hxx>
 #include <sfx2/zoomitem.hxx>
 
 #include <functional>
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 7cbde89539d4..ec6be058bf9b 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -24,10 +24,8 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <memory>
-#include <dllapi.h>
-#include <vector>
 
-#include <vcl/svapp.hxx>
+#include <vcl/vclevent.hxx>
 #include <tools/link.hxx>
 
 #include "FormattedFieldBeautifier.hxx"
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 1c42e10575d2..d794a33f13a4 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -21,10 +21,8 @@
 
 #include <com/sun/star/report/XSection.hpp>
 #include "ReportDefines.hxx"
-#include "StartMarker.hxx"
 #include <o3tl/deleter.hxx>
 #include <svtools/ruler.hxx>
-#include <svx/svdedtv.hxx>
 #include <sfx2/zoomitem.hxx>
 
 #include <memory>
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index 9c125121b9e1..91e37d54ad44 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_RPTUNDO_HXX
 
+#include <RptModel.hxx>
 #include <UndoActions.hxx>
 #include <functional>
 
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 47e8d715464c..c166e1f759d5 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -23,8 +23,6 @@
 #include <com/sun/star/report/XSection.hpp>
 #include <comphelper/propmultiplex.hxx>
 #include "ReportDefines.hxx"
-#include <svtools/colorcfg.hxx>
-#include <svx/svdedtv.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <rtl/ref.hxx>
 #include "MarkedSection.hxx"
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 9197073f41a1..2ef3e8b17006 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -22,19 +22,14 @@
 #include <com/sun/star/report/XSection.hpp>
 #include <vcl/window.hxx>
 #include <vcl/split.hxx>
-#include <svtools/colorcfg.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <cppuhelper/basemutex.hxx>
 
-#include "UITools.hxx"
 #include <UndoActions.hxx>
 #include "StartMarker.hxx"
 #include "EndMarker.hxx"
 #include "ReportSection.hxx"
 
-#include <list>
-#include <map>
-
 namespace comphelper
 {
     class OPropertyChangeMultiplexer;
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 90b60c5ba37b..13aafb14fc90 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -31,7 +31,6 @@
 #include <rtl/ref.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <comphelper/stl_types.hxx>
-#include <functional>
 
 class SdrPage;
 class SdrObject;
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index fb7674138066..e03ff63648df 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -23,13 +23,8 @@
 #include <vcl/window.hxx>
 #include <svtools/colorcfg.hxx>
 #include "ReportDefines.hxx"
-#include "ReportSection.hxx"
-#include <cppuhelper/basemutex.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <svx/svdedtv.hxx>
 #include "SectionView.hxx"
 #include <unotools/options.hxx>
-#include <list>
 #include <vector>
 
 #include "MarkedSection.hxx"
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index a7bfac55421d..804b814ee6dc 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -19,7 +19,10 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFUNC_HXX
 
+#include <tools/gen.hxx>
+#include <vcl/event.hxx>
 #include <vcl/timer.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
 
 class Timer;
 class MouseEvent;
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index a19eedc0c74e..5b697df05426 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PROPBRW_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1d9cdd4c31a8..00c1d33c8a74 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -78,6 +78,7 @@
 #include <svx/svxdlg.hxx>
 #include <svx/unomid.hxx>
 #include <svx/unoprov.hxx>
+#include <svx/svxids.hrc>
 
 #include <unotools/pathoptions.hxx>
 #include <unotools/charclass.hxx>
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index d26735462811..be589d307bc8 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -18,6 +18,7 @@
  */
 #include <SectionWindow.hxx>
 #include <ReportWindow.hxx>
+#include <UITools.hxx>
 #include <rptui_slotid.hrc>
 #include <ReportController.hxx>
 #include <SectionView.hxx>
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index b9adb1767e85..2d9eda114000 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <StartMarker.hxx>
+#include <UITools.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <bitmaps.hlst>