tdf#42949 Fix IWYU warnings in include/vcl/[t-u]*

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

Change-Id: Ib32ea54a3fa690a0722fa75ddb4121ec78c0b64f
Reviewed-on: https://gerrit.libreoffice.org/65386
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

77 files changed, 102 insertions, 58 deletions

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 2e433d8550e9..7afc2c2d2595 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/media/XManager.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/sysdata.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLContext.hxx>
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index b55e273fdca8..6788cdb31b0f 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -26,6 +26,8 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <tools/diagnose_ex.h>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 32f6d8adf1bc..764c0507ae66 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -57,6 +57,7 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
+#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0baf1cb251fd..273199fbfcbc 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -39,6 +39,7 @@
 #include <tools/diagnose_ex.h>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <vcl/treelistentry.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f57e62318f75..bee654fae060 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 #include <comphelper/types.hxx>
+#include <comphelper/processfactory.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/itempool.hxx>
 #include <svx/sdrpaintwindow.hxx>
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 74566308ca78..357f05255ee0 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/types.hxx>
+#include <comphelper/processfactory.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdview.hxx>
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index 74f8a9b5d0cd..d6b6ece8fc5d 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -20,6 +20,7 @@
 #include <SvxConfigPageHelper.hxx>
 
 #include <comphelper/random.hxx>
+#include <comphelper/processfactory.hxx>
 
 static sal_Int16 theImageType =
     css::ui::ImageType::COLOR_NORMAL |
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index fda67a3b8c29..3bc53dd7522b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -98,6 +98,7 @@
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <dlgname.hxx>
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5175e2cc7719..cabc9003fd5b 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <config_gpgme.h>
 #if HAVE_FEATURE_GPGME
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 344a92126b5f..520dac2b54ad 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -22,6 +22,7 @@
 #include <osl/diagnose.h>
 #include <basic/basmgr.hxx>
 #include <comphelper/string.hxx>
+#include <comphelper/processfactory.hxx>
 #include <svl/macitem.hxx>
 #include <svx/dialogs.hrc>
 #include <svtools/svmedit.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 47cc3d5d61c4..9b058ea0f918 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -69,6 +69,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <cppuhelper/typeprovider.hxx>
+#include <comphelper/processfactory.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 4ce065ca1c6f..00a6fcb8e0d6 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -91,6 +91,7 @@
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
 
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 95039c6d012c..e2f668d66d1f 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <vcl/edit.hxx>
 #include <tools/debug.hxx>
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index f48ab54da588..aecc07873c78 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -23,6 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/solar.hrc>
 #include <com/sun/star/view/XRenderable.hpp>
+#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 52dfdd4b7975..030e6df5eab7 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/theUIElementFactoryManager.hpp>
+#include <com/sun/star/container/NoSuchElementException.hpp>
 
 typedef cppu::ImplInheritanceHelper< svt::ToolboxController,
                                      css::frame::XSubToolbarController,
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f2f6169f8a69..d9d8facad6d0 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -270,3 +270,13 @@ blacklist:
     include/vcl/prntypes.hxx:
     # Needed for macro
     - tools/solar.h
+    include/vcl/transfer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/datatransfer/XTransferable2.hpp
+    - com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp
+    - com/sun/star/datatransfer/dnd/XDragSourceListener.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/frame/XTerminateListener.hpp
+    - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp
+    - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 81a9ea1a698a..f78c4316fc6c 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/weakref.hxx>
 
 #include <sfx2/ctrlitem.hxx>
 #include <osl/mutex.hxx>
diff --git a/include/vcl/svlbitm.hxx b/include/vcl/svlbitm.hxx
index cd8001614195..c5e478a6d539 100644
--- a/include/vcl/svlbitm.hxx
+++ b/include/vcl/svlbitm.hxx
@@ -29,6 +29,7 @@
 #include <o3tl/typed_flags_set.hxx>
 
 class SvTreeListEntry;
+class SvLBoxButton;
 
 
 enum class SvBmp
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index dbb82b3594ec..332f92abb4e9 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -30,7 +30,6 @@
 struct ImplTabItem;
 struct ImplTabCtrlData;
 class TabPage;
-class PushButton;
 class ListBox;
 
 #ifndef TAB_APPEND
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index 32a34e3767da..7c6c18b473d3 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -24,7 +24,6 @@
 #include <vcl/dialog.hxx>
 
 class FixedLine;
-class TabControl;
 
 class VCL_DLLPUBLIC TabDialog : public Dialog
 {
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index bd8475d81591..29af647d6cd7 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_TABPAGE_HXX
 #define INCLUDED_VCL_TABPAGE_HXX
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/builder.hxx>
 #include <vcl/weld.hxx>
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 76d2890055fb..f5af890e2f57 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -22,9 +22,7 @@
 
 #include <vcl/dllapi.h>
 #include <sal/log.hxx>
-#include <memory>
 
-class Scheduler;
 struct ImplSchedulerData;
 
 enum class TaskPriority
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index cd961420261b..7e6c9d452590 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -47,19 +47,14 @@ class TextAttrib;
 class TextCharAttrib;
 class TextUndo;
 class TextUndoManager;
-class EditSelFunctionSet;
-class Idle;
 class IdleFormatter;
 class TextNode;
 class OutputDevice;
-class SfxUndoAction;
 class KeyEvent;
 class Timer;
 class SfxUndoManager;
 class TextLine;
-class TETextPortion;
 struct TEIMEInfos;
-class SvtCTLOptions;
 
 namespace com {
 namespace sun {
diff --git a/include/vcl/textrectinfo.hxx b/include/vcl/textrectinfo.hxx
index 8b98e1a37c99..c13d65e80362 100644
--- a/include/vcl/textrectinfo.hxx
+++ b/include/vcl/textrectinfo.hxx
@@ -20,7 +20,8 @@
 #ifndef INCLUDED_VCL_TEXTRECTINFO_HXX
 #define INCLUDED_VCL_TEXTRECTINFO_HXX
 
-#include <vcl/outdev.hxx>
+#include <vcl/dllapi.h>
+class OutputDevice;
 
 class VCL_DLLPUBLIC TextRectInfo
 {
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 1b30c9904c04..0b10eea1d47a 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -26,19 +26,15 @@
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
 #include <vcl/textdata.hxx>
-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>
 #include <memory>
 
 class TextEngine;
-class OutputDevice;
 
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
-class TextSelFunctionSet;
-class SelectionEngine;
-class VirtualDevice;
-struct TextDDInfo;
+namespace vcl { class Window; }
 
 namespace com { namespace sun { namespace star {
     namespace datatransfer { namespace clipboard {
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 7879536afc9e..b8962f2d0e0b 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -21,11 +21,9 @@
 #define INCLUDED_VCL_THREADEX_HXX
 
 #include <osl/conditn.hxx>
-#include <osl/thread.h>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
 
-#include <cppuhelper/exc_hlp.hxx>
 #include <boost/optional.hpp>
 #include <memory>
 
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index d079a8d39ea0..b0f49b18c38e 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -24,8 +24,6 @@
 #include <vcl/imgctrl.hxx>
 #include <vcl/timer.hxx>
 
-#include <com/sun/star/graphic/XGraphic.hpp>
-
 #include <vector>
 
 class VCL_DLLPUBLIC Throbber : public ImageControl
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 6e2c7e4b6325..ea6672d12ac8 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_TOOLBOX_HXX
 #define INCLUDED_VCL_TOOLBOX_HXX
 
-#include <vcl/vclstatuslistener.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dockwin.hxx>
@@ -31,14 +30,13 @@
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
+namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com { namespace sun { namespace star { namespace frame { struct FeatureStateEvent; } } } }
+template <class T> class VclStatusListener;
 
 class Timer;
-class UserDrawEvent;
 struct ImplToolItem;
 struct ImplToolBoxPrivateData;
-class  ImplTrackRect;
 class  PopupMenu;
 
 #define TOOLBOX_STYLE_FLAT          (sal_uInt16(0x0004))
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 8da3e4ec7a8a..7b5fb5ea9618 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -23,8 +23,6 @@
 #include <vcl/dllapi.h>
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <tools/ref.hxx>
 #include <tools/solar.h>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
@@ -35,16 +33,21 @@
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDragGestureRecognizer; } } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace datatransfer { namespace dnd { class XDropTarget; } } } } }
+
+namespace tools { template <typename T> class SvRef; }
+template <typename Arg, typename Ret> class Link;
+
 class BitmapEx;
 class GDIMetaFile;
 class Graphic;
diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx
index 3b7eba4a2c36..8b56418bf063 100644
--- a/include/vcl/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -22,15 +22,12 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/treelistentries.hxx>
-#include <vcl/viewdataentry.hxx>
 
 #include <tools/solar.h>
 #include <tools/link.hxx>
 #include <tools/contnr.hxx>
 
-#include <limits.h>
 #include <memory>
-#include <vector>
 
 enum class SvListAction
 {
@@ -50,6 +47,7 @@ enum class SvListAction
 
 class SvTreeListEntry;
 class SvListView;
+class SvViewDataEntry;
 
 enum SvSortMode { SortAscending, SortDescending, SortNone };
 
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index ccda59cda51f..1e3351153ca1 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -27,9 +27,6 @@
 #include <vector>
 
 #include <vcl/ctrl.hxx>
-#include <vcl/seleng.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/mnemonicengine.hxx>
 #include <vcl/quickselectionengine.hxx>
@@ -39,20 +36,19 @@
 #include <vcl/treelist.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/menu.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-class Application;
 class SvTreeListBox;
 class SvTreeListEntry;
 struct SvViewDataItem;
 class SvViewDataEntry;
 class SvInplaceEdit2;
 class SvLBoxString;
-class SvLBoxButton;
-class SvLBoxContextBmp;
 class SvImpLBox;
 class SvLBoxButtonData;
-struct SvLBoxDDInfo;
+class Timer;
+class Edit;
 
 namespace utl {
     class AccessibleStateSetHelper;
@@ -186,8 +182,6 @@ namespace o3tl
 }
 
 struct SvTreeListBoxImpl;
-class SalInstanceTreeView;
-class SalInstanceEntryTreeView;
 
 class VCL_DLLPUBLIC SvTreeListBox
                 :public Control
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 677d5e0c6a5c..13019667ea85 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_VCL_TXTATTR_HXX
 #define INCLUDED_VCL_TXTATTR_HXX
 
-#include <rtl/ustring.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <vcl/dllapi.h>
 #include <memory>
 
diff --git a/include/vcl/uitest/eventdescription.hxx b/include/vcl/uitest/eventdescription.hxx
index 7c5eec65b2a6..ed2b54f3439b 100644
--- a/include/vcl/uitest/eventdescription.hxx
+++ b/include/vcl/uitest/eventdescription.hxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtl/ustring.hxx>
 #include <map>
 
 struct EventDescription
@@ -15,4 +16,4 @@ struct EventDescription
     std::map<OUString, OUString> aParameters;
 };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 18fadd77aad2..89f7c72f693b 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -10,14 +10,16 @@
 #include <vcl/dllapi.h>
 
 #include <tools/stream.hxx>
-#include <vcl/ctrl.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
+#include <vcl/vclevent.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
 } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
 
 struct EventDescription;
+class Control;
+class KeyEvent;
 
 class UITEST_DLLPUBLIC UITestLogger
 {
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index e56801af17f4..3a94ffa53bc5 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -17,7 +17,6 @@
 #include <vcl/window.hxx>
 #include <vcl/spin.hxx>
 #include <vcl/button.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
@@ -29,6 +28,8 @@
 
 #include <set>
 
+class Edit;
+
 typedef std::map<const OUString, OUString> StringMap;
 
 /**
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 1759ea7656b0..00465b0ee1e8 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -12,11 +12,11 @@
 #include <vcl/dllapi.h>
 
 #include <memory>
-#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
 } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 class UIObject;
 
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 7fe34d48a6da..ab00fff5d553 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/awt/FontSlant.hpp>
-#include <rtl/ustring.hxx>
 #include <tools/fontenum.hxx>
 #include <vcl/dllapi.h>
 
@@ -32,7 +31,6 @@ namespace star {
 namespace i18n {
     class XBreakIterator;
     class XCharacterClassification;
-    class XCollator;
 }}}}
 
 namespace com {
@@ -43,11 +41,6 @@ namespace accessibility {
 }
 }}}
 
-namespace comphelper {
-    namespace string {
-        class NaturalStringSorter;
-}}
-
 namespace vcl
 {
 namespace unohelper
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 83fe38f92de1..908cec305ad8 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -40,6 +40,7 @@
 #include <strings.hxx>
 #include <ColumnInfo.hxx>
 
+#include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <svtools/imgdef.hxx>
 #include <vcl/treelistentry.hxx>
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 0b532e51c63b..13b73b44e14a 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_ADDFIELD_HXX
 
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <vcl/transfer.hxx>
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index ba390ad7bfd2..337ee8c29dd5 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -26,6 +26,7 @@
 #include <vcl/timer.hxx>
 #include <osl/mutex.hxx>
 #include "scdllapi.h"
+#include <memory>
 
 class ScRefreshTimerControl
 {
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index d7386343efdb..994dbe2ad2e9 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -11,6 +11,7 @@
 #include <tabvwsh.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
 #include "helper/qahelper.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 3b57bad7a6ec..ac14129d0e74 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -9,6 +9,7 @@
 
 #include <sal/config.h>
 #include <test/bootstrapfixture.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <docsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index a28b5851986d..49a3dda04cc8 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -13,6 +13,7 @@
 #include "qahelper.hxx"
 
 #include <unotools/ucbstreamhelper.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <test/xmltesttools.hxx>
 
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index fb73f88a7bd3..383ad69bb3b3 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -20,6 +20,7 @@
 #include <scitems.hxx>
 #include <o3tl/make_unique.hxx>
 #include <comphelper/fileformat.h>
+#include <comphelper/processfactory.hxx>
 #include <tools/urlobj.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/frmdiritem.hxx>
diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index edfdb6b65aec..62ac11817a57 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -27,6 +27,7 @@
 #include <orcus/sax_parser_base.hpp>
 #include <orcus/stream.hpp>
 
+#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <comphelper/processfactory.hxx>
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 6179192b1641..63f86f079bbb 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -85,6 +85,7 @@
 #include <comphelper/base64.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 418771a94d0f..418de20d129f 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -66,6 +66,7 @@
 #include <sfx2/objsh.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <list>
 #include <algorithm>
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index d7a1809c56eb..f354ec9d1e22 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -28,6 +28,7 @@
 #include <orcusfiltersimpl.hxx>
 #include <config_folders.h>
 #include <unotools/configmgr.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <drwlayer.hxx>
 #include <stlpool.hxx>
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 1644c6eba5c6..4d316ed29e15 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -35,6 +35,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/configmgr.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <tablink.hxx>
 
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index 94bf491c2e13..b8e8eb73ce7d 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/objsh.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx
index 01a1e435014f..79b769178133 100644
--- a/sc/source/ui/unoobj/forbiuno.cxx
+++ b/sc/source/ui/unoobj/forbiuno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <editeng/forbiddencharacterstable.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <forbiuno.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index dea3ad87b8e9..e5514e9d7e9f 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -41,6 +41,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <comphelper/profilezone.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index fd8b652bd209..b87765d0afd8 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -22,6 +22,7 @@
 #include <vcl/treelistentry.hxx>
 #include <vcl/viewdataentry.hxx>
 #include <sfx2/objsh.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index d3d6be34d9b1..d27a4c13efcb 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -30,6 +30,7 @@
 #include <list>
 #include <vector>
 #include <map>
+#include <memory>
 
 class SdrPathObj;
 class SdrModel;
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index e72f427a367e..3cc6c40a8f71 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -26,6 +26,7 @@
 
 #include <com/sun/star/drawing/XShape.hpp>
 #include <vcl/treelistbox.hxx>
+#include <vcl/builder.hxx>
 #include <CustomAnimationEffect.hxx>
 #include <CustomAnimationPreset.hxx>
 
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 971cd0e2f24d..8323c548f623 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1fe733db069a..128909f2c6c4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -66,6 +66,7 @@
 #include <vcl/settings.hxx>
 
 #include <comphelper/anytostring.hxx>
+#include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ref.hxx>
 #include <sal/log.hxx>
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 4e1e24b07f65..d4fa97c3f85c 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -33,6 +33,7 @@
 #include <cppcanvas/basegfxfactory.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/processfactory.hxx>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::WeakReference;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 52a625346cbc..7a0d8a267d84 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 6a29e77056b8..1f394aaf7844 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -65,6 +65,7 @@
 
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <comphelper/string.hxx>
 
 #include <sfx2/StyleManager.hxx>
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 141097a70c0c..24e14c2c430f 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 
+#include <comphelper/processfactory.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/link.hxx>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 33c5c8d7a698..aec410c02d14 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -30,6 +30,7 @@
 
 #include <sfx2/sfxresid.hxx>
 
+#include <comphelper/processfactory.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/image.hxx>
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index dd65222696ab..c478986cc444 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx
index c323a693f045..c50aaab9b904 100644
--- a/svtools/source/contnr/iconview.cxx
+++ b/svtools/source/contnr/iconview.cxx
@@ -19,6 +19,7 @@
 
 #include <svtools/iconview.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 #include <svtools/fileview.hxx>
 #include <iconviewimpl.hxx>
 
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index 21ef4c7f264d..d40c1bb200d4 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -27,6 +27,7 @@
 #include <svl/itempool.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/intitem.hxx>
+#include <comphelper/processfactory.hxx>
 
 using namespace svx;
 
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index bec59c3a6cc0..f7e5a4b1910c 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -34,6 +34,9 @@
 #include <set>
 #include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
 
 #include <palettes.hxx>
 
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx
index 6767d4b10cc5..ab82a767ae41 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -21,6 +21,7 @@
 
 #include <IDocumentStatistics.hxx>
 #include <SwDocIdle.hxx>
+#include <memory>
 
 class SwDoc;
 struct SwDocStat;
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 3c7616a3e4fa..9269f46dc5a0 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -69,6 +69,7 @@
 #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
 #include <swabstdlg.hxx>
 #include <comphelper/dispatchcommand.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ref.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index efafcfeef501..0d02885d3d4f 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -132,6 +132,7 @@
 #include <sal/log.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <o3tl/make_unique.hxx>
+#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 1c071806a0fd..e05cf11fc238 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -49,6 +49,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index a3cccd5c7d8c..c04ad42206ca 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -19,12 +19,14 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
 
 #include <swmodule.hxx>
 #include <swdll.hxx>
 #include <unofreg.hxx>
 #include "unomodule.hxx"
 #include <cppuhelper/supportsservice.hxx>
+#include <comphelper/processfactory.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c89455b0f511..57f603221c87 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
 #include <salframe.hxx>
 #include <salinst.hxx>
 #include <salvd.hxx>
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index f7680a07d524..e7b94551c5cc 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -13,7 +13,9 @@
 #include <vcl/taskpanelist.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <comphelper/processfactory.hxx>
 #include <vcl/vclevent.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
 /**
  * split from the main class since it needs different ref-counting mana
diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx
index 020f98aae940..a5a698e076f0 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -27,6 +27,8 @@
 #include <vcl/window.hxx>
 #include <comphelper/fileformat.h>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <svl/urlbmk.hxx>
 #include <vcl/inetimg.hxx>
 #include <vcl/imap.hxx>
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 432a6af86b18..70bdfedfa5f7 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -16,7 +16,7 @@
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <svdata.hxx>
-
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <memory>
 
 UITestLogger::UITestLogger():
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index bf1f69bfe54b..b4c89d1e4516 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -16,6 +16,7 @@
 #include <svdata.hxx>
 
 #include <comphelper/dispatchcommand.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 bool UITest::executeCommand(const OUString& rCommand)
 {
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index d7ea836e2e71..a09dfad43edd 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -54,6 +54,7 @@
 #include <strings.hrc>
 #include <resourcemanager.hxx>
 #include <comphelper/xmlsechelper.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <vcl/weld.hxx>
 #include <unotools/configitem.hxx>