tdf#42949 Fix IWYU warnings in include/toolkit/*

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

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

79 files changed, 244 insertions, 165 deletions

diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 812149d7ba0e..a796a36469d7 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index d8ec0900d994..bdd00387b211 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 8d08e53449b8..c8416f694a2e 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -34,6 +34,7 @@
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
+#include <vcl/window.hxx>
 
 #include <canvas/canvastools.hxx>
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index b6b3340a27dd..aa1abefed47e 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -24,6 +24,7 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
+#include <vcl/window.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 00a6fcb8e0d6..bae3fa07273b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index d2ed91fa0241..0f4c404c1c3b 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 6c7a7b546ea5..7a1d7613815a 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -70,6 +70,7 @@ namespace svt
 }
 
 namespace vcl { class Window; }
+namespace weld {class Window; }
 class ToolBox;
 namespace vcl { class Font; }
 class SvNumberFormatter;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 73bcb591fcd7..206d7b096a8a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -123,6 +123,7 @@
 #include <svtools/accessibilityoptions.hxx>
 #include <svtools/apearcfg.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/window.hxx>
 
 #include "langselect.hxx"
 
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 29076595a312..19ba0de29ac4 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -36,6 +36,7 @@
 #include <tools/diagnose_ex.h>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 
 #include <algorithm>
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index b7e023b17311..d2920a9292fd 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/inspection/PropertyControlType.hpp>
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/util/VetoException.hpp>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/types.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 97b4c60a2ede..d232a9129310 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -48,6 +48,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 #include <unotools/streamhelper.hxx>
 #include <comphelper/guarding.hxx>
 #include <comphelper/property.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index b86f47d264ba..6a94bcdeca5f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -287,3 +287,143 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleRelationSet.hpp
     - com/sun/star/accessibility/XAccessible.hpp
+    include/toolkit/awt/vclxaccessiblecomponent.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/toolkit/awt/animatedimagespeer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XAnimation.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    - com/sun/star/util/XModifyListener.hpp
+    - toolkit/awt/vclxwindow.hxx
+    include/toolkit/awt/vclxpointer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XPointer.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    include/toolkit/awt/vclxspinbutton.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XSpinValue.hpp
+    include/toolkit/awt/vclxprinter.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XPrinterPropertySet.hpp
+    - com/sun/star/awt/XInfoPrinter.hpp
+    - com/sun/star/awt/XPrinterPropertySet.hpp
+    - com/sun/star/awt/XPrinterServer.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/toolkit/awt/vclxtopwindow.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XTopWindow2.hpp
+    - com/sun/star/awt/XSystemDependentWindowPeer.hpp
+    include/toolkit/awt/vclxtabpagecontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/tab/XTabPageContainer.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    - toolkit/awt/vclxcontainer.hxx
+    include/toolkit/awt/vclxwindow.hxx:
+    # base class has to be a complete type
+    - toolkit/awt/vclxdevice.hxx
+    - com/sun/star/awt/XWindow2.hpp
+    - com/sun/star/awt/XVclWindowPeer.hpp
+    - com/sun/star/awt/XLayoutConstrains.hpp
+    - com/sun/star/awt/XView.hpp
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
+    - com/sun/star/awt/XDockableWindow.hpp
+    - com/sun/star/awt/XStyleSettingsSupplier.hpp
+    include/toolkit/awt/vclxwindows.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XListBox.hpp
+    - com/sun/star/awt/XToggleButton.hpp
+    - com/sun/star/awt/XComboBox.hpp
+    - com/sun/star/awt/XItemListListener.hpp
+    include/toolkit/controls/accessiblecontrolcontext.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XEventListener.hpp
+    include/toolkit/controls/animatedimages.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XAnimatedImages.hpp
+    - toolkit/controls/unocontrolmodel.hxx
+    include/toolkit/controls/controlmodelcontainerbase.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/tab/XTabPageModel.hpp
+    - com/sun/star/awt/XTabControllerModel.hpp
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    - com/sun/star/container/XContainer.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    - com/sun/star/lang/XInitialization.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/util/XChangesListener.hpp
+    - com/sun/star/util/XChangesNotifier.hpp
+    - toolkit/controls/unocontrolcontainer.hxx
+    include/toolkit/controls/dialogcontrol.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/UnoControlDialog.hpp
+    include/toolkit/controls/eventcontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XContainer.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    include/toolkit/controls/geometrycontrolmodel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/script/XScriptEventsSupplier.hpp
+    - com/sun/star/util/XCloneable.hpp
+    # Needed for template classes
+    - toolkit/controls/geometrycontrolmodel_impl.hxx
+    include/toolkit/controls/roadmapcontrol.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XItemEventBroadcaster.hpp
+    - com/sun/star/awt/XItemListener.hpp
+    - com/sun/star/beans/XPropertyChangeListener.hpp
+    - com/sun/star/container/XContainerListener.hpp
+    include/toolkit/controls/roadmapentry.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/toolkit/controls/tabpagecontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/tab/XTabPageContainer.hpp
+    - toolkit/controls/controlmodelcontainerbase.hxx
+    include/toolkit/controls/tabpagemodel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/tab/XTabPage.hpp
+    - toolkit/controls/unocontrolcontainer.hxx
+    include/toolkit/controls/unocontrol.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XControl.hpp
+    - com/sun/star/awt/XWindow2.hpp
+    - com/sun/star/awt/XView.hpp
+    - com/sun/star/beans/XPropertiesChangeListener.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/awt/XUnitConversion.hpp
+    - com/sun/star/awt/XStyleSettingsSupplier.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
+    - com/sun/star/util/XModeChangeBroadcaster.hpp
+    include/toolkit/controls/unocontrolcontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XControlContainer.hpp
+    - com/sun/star/awt/XUnoControlContainer.hpp
+    - com/sun/star/container/XContainer.hpp
+    - com/sun/star/container/XIdentifierContainer.hpp
+    - toolkit/controls/unocontrolbase.hxx
+    include/toolkit/controls/unocontrolmodel.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XControlModel.hpp
+    - com/sun/star/lang/XComponent.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/beans/XPropertyState.hpp
+    - com/sun/star/io/XPersistObject.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/util/XCloneable.hpp
+    include/toolkit/controls/unocontrols.hxx:
+    # base class has to be a complete type
+    - com/sun/star/awt/XTextComponent.hpp
+    - com/sun/star/awt/XTextListener.hpp
+    - com/sun/star/awt/XTextLayoutConstrains.hpp
+    - com/sun/star/awt/XButton.hpp
+    - com/sun/star/awt/XToggleButton.hpp
+    - com/sun/star/awt/XRadioButton.hpp
+    - com/sun/star/awt/XCheckBox.hpp
+    - com/sun/star/awt/XListBox.hpp
+    - com/sun/star/awt/XItemList.hpp
+    include/toolkit/helper/macros.hxx:
+    # Needed for macros
+    - comphelper/servicehelper.hxx
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 9fc562afd695..887943032594 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index ee8ce152caf1..ebe1e41d1611 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
+#include <com/sun/star/container/XContainerListener.hpp>
 
 #include <com/sun/star/awt/XAnimation.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index f37c95c1d593..8779f0e14237 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -21,11 +21,6 @@
 #define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
 
 #include <toolkit/dllapi.h>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/accimplaccess.hxx>
@@ -35,9 +30,10 @@
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
 
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+
 namespace vcl { class Window; }
 class VCLXWindow;
-class VclSimpleEvent;
 class VclWindowEvent;
 
 namespace utl {
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 3bce61ff95af..3240dac27e99 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/awt/XVclContainer.hpp>
 #include <com/sun/star/awt/XVclContainerPeer.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 8d900612abb3..d47f3816b76f 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -30,9 +30,6 @@
 
 #include <com/sun/star/awt/XUnitConversion.hpp>
 
-class OutputDevice;
-class VirtualDevice;
-
 /// An UNO wrapper for the VCL OutputDevice
 class TOOLKIT_DLLPUBLIC VCLXDevice :
                     public css::awt::XDevice,
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 9b12b496a21b..e7cd07b13443 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -23,12 +23,15 @@
 #include <memory>
 #include <toolkit/dllapi.h>
 #include <com/sun/star/awt/XFont2.hpp>
-#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/metric.hxx>
+#include <vcl/font.hxx>
+
+namespace com { namespace sun { namespace star { namespace awt { class XDevice; } } } }
+
+class FontMetric;
 
 
 //  class VCLXFont
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 8fc980a731de..3fc82faef25d 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -22,7 +22,6 @@
 
 
 #include <com/sun/star/awt/XGraphics2.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weak.hxx>
@@ -36,6 +35,7 @@
 
 class OutputDevice;
 namespace vcl { class Region; }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
 
 
 enum class InitOutDevFlags
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index e678d8b5d945..97b28432a74b 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -39,7 +39,6 @@
 
 class Menu;
 class MenuBar;
-class VclSimpleEvent;
 class PopupMenu;
 class VclMenuEvent;
 
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 5478e9daf75e..60fb105b77d9 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -22,19 +22,20 @@
 
 
 #include <com/sun/star/awt/XPrinterPropertySet.hpp>
-#include <com/sun/star/awt/XPrinter.hpp>
 #include <com/sun/star/awt/XPrinterServer.hpp>
 #include <com/sun/star/awt/XInfoPrinter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/weak.hxx>
 
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/jobset.hxx>
 
-#include <vcl/oldprintadaptor.hxx>
+namespace com { namespace sun { namespace star { namespace awt { class XPrinter; } } } }
+namespace vcl { class OldStylePrintAdaptor; }
+class Printer;
 
 // relevant properties for the printer:
 /*
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index d92cb6b65d6c..d53755aca336 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -22,7 +22,6 @@
 
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index d6467fed9893..732c386e0ea1 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -20,14 +20,7 @@
 #ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
 #define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
 
-#include <toolkit/dllapi.h>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
-#include <toolkit/awt/vclxwindow.hxx>
 #include <com/sun/star/awt/tab/XTabPageContainer.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index cc8746ba6ec6..b018b20335f9 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -22,13 +22,14 @@
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
 #include <com/sun/star/awt/XTopWindow2.hpp>
-#include <com/sun/star/awt/XMenuBar.hpp>
 #include <cppuhelper/weak.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 
 #include <toolkit/awt/vclxcontainer.hxx>
 
+namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }
+
 typedef ::cppu::ImplHelper1 <   css::awt::XTopWindow2
                             >   VCLXTopWindow_XBase;
 typedef ::cppu::ImplHelper1 <   css::awt::XSystemDependentWindowPeer
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 27be3e102d32..651594b46e66 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -22,36 +22,30 @@
 
 #include <toolkit/dllapi.h>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <toolkit/helper/listenermultiplexer.hxx>
 #include <vcl/window.hxx>
 
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XView.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/awt/XDockableWindow.hpp>
 #include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
 
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
 
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
 
-#include <stdarg.h>
 #include <memory>
 #include <vector>
 #include <functional>
 
+namespace comphelper { class OInterfaceContainerHelper2; }
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
 
-class VclSimpleEvent;
 class VclWindowEvent;
-struct SystemParentData;
 
 namespace toolkit
 {
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 384bab4ffe76..6982c6dbee3d 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -22,49 +22,20 @@
 
 #include <toolkit/dllapi.h>
 
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/beans/XVetoableChangeListener.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
-#include <com/sun/star/beans/PropertyStateChangeEvent.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/awt/XFileDialog.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
-#include <com/sun/star/awt/XProgressMonitor.hpp>
-#include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/XScrollBar.hpp>
-#include <com/sun/star/awt/XVclContainerPeer.hpp>
-#include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/awt/XMessageBox.hpp>
 #include <com/sun/star/awt/XTextEditField.hpp>
-#include <com/sun/star/awt/Style.hpp>
 #include <com/sun/star/awt/XTimeField.hpp>
-#include <com/sun/star/awt/XVclWindowPeer.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XSpinField.hpp>
-#include <com/sun/star/awt/XUnoControlContainer.hpp>
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
 #include <com/sun/star/awt/XNumericField.hpp>
 #include <com/sun/star/awt/XMetricField.hpp>
 #include <com/sun/star/awt/XButton.hpp>
 #include <com/sun/star/awt/XToggleButton.hpp>
-#include <com/sun/star/awt/XPointer.hpp>
-#include <com/sun/star/awt/XTextArea.hpp>
-#include <com/sun/star/awt/XImageButton.hpp>
 #include <com/sun/star/awt/XFixedHyperlink.hpp>
 #include <com/sun/star/awt/XFixedText.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XDialog2.hpp>
 #include <com/sun/star/awt/XRadioButton.hpp>
 #include <com/sun/star/awt/XCurrencyField.hpp>
@@ -73,7 +44,6 @@
 #include <com/sun/star/awt/XComboBox.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XItemListListener.hpp>
-#include <com/sun/star/awt/XImageConsumer.hpp>
 #include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -82,24 +52,13 @@
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxtopwindow.hxx>
+#include <toolkit/helper/listenermultiplexer.hxx>
 
-#include <vcl/pointr.hxx>
 #include <vcl/image.hxx>
-#include <vcl/tabctrl.hxx>
-
-class Button;
-class CheckBox;
-class RadioButton;
-class ListBox;
-class ScrollBar;
-class Edit;
-class Menu;
-class ComboBox;
+
 class FormatterBase;
-class SpinField;
-class ToolBox;
-class VclSimpleEvent;
-class VclMenuEvent;
+class TabControl;
+class TabPage;
 
 
 //  class VCLXGraphicControl
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 180fd538551c..9123c61e484d 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -24,11 +24,12 @@
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
 
 namespace toolkit
 {
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index c4820ce86f69..d6bac5fe6009 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
 #define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
 
-#include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <com/sun/star/awt/XAnimatedImages.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace toolkit
 {
 
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 9d92b8d4e8dc..b2f4af1f5484 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/weak.hxx>
@@ -37,13 +36,13 @@
 #include <toolkit/controls/unocontrolcontainer.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/awt/tab/XTabPageModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <tools/gen.hxx>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 //  class ControlModelContainerBase
 
 typedef UnoControlModel     ControlModel_Base;
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 082e08205f3e..83e9b13b2800 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -22,17 +22,11 @@
 
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
 #include <com/sun/star/awt/UnoControlDialog.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/XDialog2.hpp>
 #include <com/sun/star/awt/XSimpleTabController.hpp>
-#include <com/sun/star/graphic/XGraphicObject.hpp>
-#include <toolkit/helper/servicenames.hxx>
 #include <toolkit/helper/macros.hxx>
-#include <toolkit/controls/unocontrolcontainer.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <list>
+
+namespace com { namespace sun { namespace star { namespace awt { class XTopWindowListener; } } } }
 
 typedef ::cppu::AggImplInheritanceHelper2   <   ControlContainerBase
                                             ,   css::awt::XUnoControlDialog
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index cc1d20493e4c..29ce0beecf80 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
 #define INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX
 
-#include <osl/diagnose.h>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index 8bacfa35b6bf..cf2cd9129bba 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -22,9 +22,8 @@
 
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
-#include <toolkit/helper/servicenames.hxx>
 
-#include <com/sun/star/util/XNumberFormatter.hpp>
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } }
 
 
 namespace toolkit
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index cf8ea9bdacd0..be0daf863ad5 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -24,21 +24,14 @@
 #include <comphelper/propagg.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
-#include <com/sun/star/resource/XStringResourceResolver.hpp>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/IdPropArrayHelper.hxx>
 
+namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
+
 namespace com { namespace sun { namespace star {
-    namespace lang {
-        class XMultiServiceFactory;
-    }
-    namespace script {
-        class XNameContainer;
-    }
     namespace uno {
         class XComponentContext;
     }
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index c5a51a709476..b73916d22c3b 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -23,8 +23,6 @@
 
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
-#include <toolkit/helper/servicenames.hxx>
-#include <toolkit/controls/roadmapentry.hxx>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index c39c2da70871..b6b5b5ef762e 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -23,15 +23,15 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/awt/XTabController.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weakagg.hxx>
 #include <osl/mutex.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
 
 
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
+namespace com { namespace sun { namespace star { namespace awt { class XControlContainer; } } } }
+
 class StdTabController final : public css::awt::XTabController,
                             public css::lang::XServiceInfo,
                             public css::lang::XTypeProvider,
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 2f73c1c8af56..e930ed159d7c 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -24,15 +24,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/weakagg.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
 #include <osl/mutex.hxx>
 
-#include <tools/gen.hxx>
 #include <vector>
 
 struct UnoControlModelEntry;
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index 5e85542c99af..e7ace6cd8980 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -22,17 +22,17 @@
 
 #include <com/sun/star/awt/tab/XTabPageContainer.hpp>
 #include <com/sun/star/awt/tab/XTabPageContainerModel.hpp>
-#include <com/sun/star/awt/tab/XTabPageContainerListener.hpp>
-#include <com/sun/star/awt/tab/XTabPage.hpp>
-#include <com/sun/star/awt/tab/XTabPageModel.hpp>
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
-#include <toolkit/helper/servicenames.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
 
+namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPage; } } } } }
+namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageContainerListener; } } } } }
+namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageModel; } } } } }
+
 //  class css::awt::tab::UnoControlTabPageContainerModel
 
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index c4a33337d1fb..a4e76081b5fb 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -21,14 +21,8 @@
 #define INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
 
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
-#include <com/sun/star/awt/tab/XTabPageModel.hpp>
 #include <com/sun/star/awt/tab/XTabPage.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <toolkit/helper/servicenames.hxx>
-#include <toolkit/helper/macros.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <list>
 #include <cppuhelper/implbase2.hxx>
 
 class UnoControlTabPageModel :  public ControlModelContainerBase
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index 3682a4e57551..3abd331de396 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.hxx
@@ -20,12 +20,9 @@
 #define INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
 
 #include <toolkit/controls/unocontrolmodel.hxx>
-#include <toolkit/helper/servicenames.hxx>
 #include <toolkit/controls/unocontrolbase.hxx>
-#include <toolkit/helper/macros.hxx>
 #include <com/sun/star/awt/XScrollBar.hpp>
 #include <com/sun/star/awt/XAdjustmentListener.hpp>
-#include <com/sun/star/awt/AdjustmentType.hpp>
 
 
 namespace toolkit
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 7bc020140686..94b3f09a1999 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -26,17 +26,11 @@
 #include <com/sun/star/awt/XView.hpp>
 #include <com/sun/star/beans/XPropertiesChangeListener.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/awt/XUnitConversion.hpp>
 #include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <cppuhelper/weakagg.hxx>
 #include <osl/mutex.hxx>
-#include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
-#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase9.hxx>
 #include <com/sun/star/util/XModeChangeBroadcaster.hpp>
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index 816632d418db..79da9c09489c 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -26,10 +26,7 @@
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XIdentifierContainer.hpp>
 
-#include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/controls/unocontrolbase.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
 
 #include <cppuhelper/implbase4.hxx>
 #include <memory>
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index b541f275976e..1de5058dc90a 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -22,8 +22,6 @@
 
 
 #include <toolkit/controls/unocontrolmodel.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
 
 
 //  class css::awt::UnoControlContainerModel
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index b736e6db49f1..aa358a927246 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -25,17 +25,14 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/weakagg.hxx>
 
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/ref.hxx>
@@ -43,6 +40,8 @@
 #include <vector>
 #include <map>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable;
 
 
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index c7fd44c520f7..5feb07b266c6 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -42,23 +42,21 @@
 #include <com/sun/star/awt/XPatternField.hpp>
 #include <com/sun/star/awt/XProgressBar.hpp>
 #include <com/sun/star/awt/XItemList.hpp>
-#include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
-#include <vcl/bitmapex.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
+#include <tools/gen.hxx>
 
-#include <list>
 #include <memory>
 #include <vector>
 
 namespace boost { template <class T> class optional; }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
 
 class ImageHelper
 {
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 5a52d97b5503..d10f0195448a 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 namespace com { namespace sun { namespace star { namespace accessibility {
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 39df68cdf445..a60604d9801b 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -22,12 +22,13 @@
 
 #include <toolkit/dllapi.h>
 
-#include <com/sun/star/awt/XControl.hpp>
-
 #include <vcl/pdfwriter.hxx>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
 namespace vcl
 {
     class PDFExtOutDevData;
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index 39bd83045bc2..a76336996244 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/awt/tree/XTreeExpansionListener.hpp>
 #include <com/sun/star/awt/tree/XTreeEditListener.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <com/sun/star/util/VetoException.hpp>
 #include <cppuhelper/weak.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <toolkit/helper/mutexhelper.hxx>
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 8413606fade0..fc20ee8c0009 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_TOOLKIT_HELPER_MACROS_HXX
 #define INCLUDED_TOOLKIT_HELPER_MACROS_HXX
 
-#include <string.h>
-
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/servicehelper.hxx>
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index 91d0905814e3..19d9a6d21c22 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -22,21 +22,20 @@
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
 #include <vcl/bitmapex.hxx>
+#include <vcl/font.hxx>
 #include <vcl/region.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/poly.hxx>
 
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 namespace com { namespace sun { namespace star { namespace uno {
     class XInterface;
 }}}}
@@ -49,7 +48,6 @@ namespace com { namespace sun { namespace star { namespace awt {
     class XGraphics;
     class XRegion;
     class XDevice;
-    class XPointer;
     class XToolkit;
     class XFont;
     class XControlContainer;
@@ -62,6 +60,7 @@ namespace com { namespace sun { namespace star { namespace awt {
 }}}}
 
 
+class FontMetric;
 class OutputDevice;
 class MouseEvent;
 class KeyEvent;
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 5d00257768e6..e39b860e3649 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -36,6 +36,7 @@
 #include <rtl/ref.hxx>
 #include <svl/itemprop.hxx>
 #include <vcl/GraphicObject.hxx>
+#include <vcl/outdev.hxx>
 
 #define UNOGRAPHIC_DEVICE           1
 #define UNOGRAPHIC_DESTINATIONRECT  2
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 02a0c8a09780..c2b9216a2863 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -26,6 +26,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <osl/mutex.hxx>
+#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index bcbe6d7805e2..7c4b0cf318df 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
+#include <osl/diagnose.h>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 1e4a10b82dc7..049cab08dfa1 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -26,9 +26,11 @@
 
 #include <cppuhelper/typeprovider.hxx>
 
+#include <com/sun/star/awt/XProgressBar.hpp>
 #include <com/sun/star/awt/XTextArea.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <svtools/svmedit.hxx>
 #include <vcl/fmtfield.hxx>
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 2da0c1a1255d..29878846dc20 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -21,6 +21,7 @@
 #include <svtools/embedhlp.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/outdev.hxx>
 #include <bitmaps.hlst>
 
 #include <sal/log.hxx>
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 5841480b5f7d..4c556201eb5e 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -64,7 +64,6 @@ using css::awt::grid::XGridColumn;
 using css::container::ContainerEvent;
 using css::awt::grid::GridDataEvent;
 using css::awt::grid::GridInvalidModelException;
-using css::util::VetoException;
 
 namespace AccessibleEventId = css::accessibility::AccessibleEventId;
 namespace AccessibleStateType = css::accessibility::AccessibleStateType;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index f38861d4442b..506cfd84801a 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
+#include <com/sun/star/util/VetoException.hpp>
 #include <o3tl/any.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index d5c4edb22cec..eb9b9303497e 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -84,6 +84,7 @@
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/window.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
 
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index def0df8e0451..89dded29bb9d 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 
 #include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/event.hxx>
 #include <vcl/window.hxx>
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 708f2e6ed420..c9c8e4cbb3cb 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -22,6 +22,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <rtl/uuid.h>
 
 #include <vcl/svapp.hxx>
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 5f0cc09cb381..6e3fc797a021 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/awt/DeviceCapability.hpp>
 
 #include <com/sun/star/util/MeasureUnit.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/awt/vclxfont.hxx>
@@ -38,7 +39,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/font.hxx>
-
+#include <vcl/metric.hxx>
 
 //  class VCLXDevice
 
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 5f8ca8b626ef..7c679eca7d80 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -28,6 +28,7 @@
 #include <rtl/uuid.h>
 #include <rtl/ustring.h>
 
+#include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 65386f1fba48..80d40dd87f96 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -32,6 +32,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/image.hxx>
 #include <vcl/gradient.hxx>
+#include <vcl/metric.hxx>
 #include <tools/debug.hxx>
 
 using namespace com::sun::star;
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 17af677eee88..38d3a6c6dd88 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -36,6 +36,7 @@
 #include <vcl/image.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
 
 #include <com/sun/star/awt/KeyModifier.hpp>
 
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 9f982059e362..aa24f31d939f 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -27,6 +27,7 @@
 
 #include <vcl/print.hxx>
 #include <vcl/jobset.hxx>
+#include <vcl/oldprintadaptor.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 6f8212149db8..b0348e02e2f0 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <stdarg.h>
 #include <memory>
 #include <com/sun/star/awt/WindowEvent.hpp>
 #include <com/sun/star/awt/KeyEvent.hpp>
@@ -60,6 +61,7 @@
 #include <vcl/commandevent.hxx>
 #include <comphelper/asyncnotification.hxx>
 #include <comphelper/flagguard.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/profilezone.hxx>
 #include "stylesettings.hxx"
 #include <tools/urlobj.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 2673c418f79d..8d73de9c9e7c 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -36,6 +36,8 @@
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/XItemList.hpp>
+#include <com/sun/star/awt/TextAlign.hpp>
+#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sal/log.hxx>
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 7f830bc033a7..a72f7694ebf8 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -21,6 +21,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 16a3affbfcdf..035822570ecf 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -25,6 +25,7 @@
 #include <toolkit/controls/dialogcontrol.hxx>
 #include <toolkit/controls/geometrycontrolmodel.hxx>
 #include <toolkit/helper/property.hxx>
+#include <toolkit/helper/servicenames.hxx>
 #include <toolkit/controls/stdtabcontroller.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 1567b5817e16..c08e1f3f63ca 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -19,6 +19,7 @@
 
 #include <toolkit/controls/formattedcontrol.hxx>
 #include <toolkit/helper/property.hxx>
+#include <toolkit/helper/servicenames.hxx>
 
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 5fe1a2194d84..62c1d53b161a 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -20,6 +20,7 @@
 #include <toolkit/controls/geometrycontrolmodel.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 3e7f9e0bd500..8c38d0f3f8d5 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -19,7 +19,9 @@
 
 
 #include <toolkit/controls/roadmapcontrol.hxx>
+#include <toolkit/controls/roadmapentry.hxx>
 #include <toolkit/helper/property.hxx>
+#include <toolkit/helper/servicenames.hxx>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index d9bcc5928ecb..394364eea74a 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -23,6 +23,7 @@
 
 #include <toolkit/controls/stdtabcontroller.hxx>
 #include <toolkit/controls/stdtabcontrollermodel.hxx>
+#include <toolkit/helper/servicenames.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index ea8510db9dba..fef9117e0e00 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -19,6 +19,7 @@
 
 #include <toolkit/controls/tkscrollbar.hxx>
 #include <toolkit/helper/property.hxx>
+#include <toolkit/helper/servicenames.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 48bdcc77d574..302327c4575d 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -24,6 +24,8 @@
 #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <toolkit/controls/unocontrol.hxx>
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index 8ecd3710347c..43b1f7642bc4 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -19,6 +19,8 @@
 
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 
 #include <toolkit/controls/unocontrolbase.hxx>
 #include <toolkit/helper/property.hxx>
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 193608416850..21219a8a325b 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/awt/XVclContainerPeer.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 37f6ea94375e..b9dff4bfee53 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -25,6 +25,7 @@
 #include <osl/module.h>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
+#include <rtl/ref.hxx>
 #include <tools/svlibrary.h>
 
 #include <helper/accessibilityclient.hxx>
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index df0b9543d632..3c8d7343a136 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
+#include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/form/FormSubmitMethod.hpp>
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 6cfedeeaa802..8d25f51e3832 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -22,6 +22,7 @@
 #include <vcl/event.hxx>
 #include <vcl/window.hxx>
 #include <vcl/unohelp.hxx>
+#include <vcl/metric.hxx>
 #include <sal/macros.h>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>