diff --git a/toolkit/inc/awt/vclxgraphics.hxx b/toolkit/inc/awt/vclxgraphics.hxx
index acf03dd17874..93db3bc8e31b 100644
--- a/toolkit/inc/awt/vclxgraphics.hxx
+++ b/toolkit/inc/awt/vclxgraphics.hxx
@@ -32,6 +32,7 @@
 #include <memory>
 
 class OutputDevice;
+class VCLXDevice;
 namespace vcl { class Region; }
 namespace com::sun::star::graphic { class XGraphic; }
 
@@ -55,7 +56,7 @@ class VCLXGraphics final : public cppu::WeakImplHelper<
 {
 private:
     // used to return same reference on each call to getDevice()
-    css::uno::Reference< css::awt::XDevice> mxDevice;
+    rtl::Reference<VCLXDevice> mxDevice;
 
     VclPtr<OutputDevice> mpOutputDevice;
     vcl::Font       maFont;
diff --git a/toolkit/inc/awt/vclxprinter.hxx b/toolkit/inc/awt/vclxprinter.hxx
index e5440f38aac4..610bc519a275 100644
--- a/toolkit/inc/awt/vclxprinter.hxx
+++ b/toolkit/inc/awt/vclxprinter.hxx
@@ -37,6 +37,7 @@
 namespace com::sun::star::awt { class XPrinter; }
 namespace vcl { class OldStylePrintAdaptor; }
 class Printer;
+class VCLXDevice;
 
 // relevant properties for the printer:
 /*
@@ -58,7 +59,7 @@ class VCLXPrinterPropertySet    :public VCLXPrinterPropertySet_Base
 {
 protected:
     VclPtr<Printer>             mxPrinter;
-    css::uno::Reference< css::awt::XDevice >  mxPrnDevice;
+    rtl::Reference< VCLXDevice >  mxPrnDevice;
 
     sal_Int16                   mnOrientation;
     bool                        mbHorizontal;
@@ -67,7 +68,7 @@ public:
     virtual ~VCLXPrinterPropertySet() override;
 
     Printer*                    GetPrinter() const { return mxPrinter.get(); }
-    css::uno::Reference< css::awt::XDevice > const &  GetDevice();
+    rtl::Reference< VCLXDevice > const &  GetDevice();
 
     // css::uno::XInterface
     DECLARE_XINTERFACE();
diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx
index 31dcc3707525..57c923e90ee9 100644
--- a/toolkit/inc/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx
@@ -223,7 +223,7 @@ protected:
     bool                                                                        mbSizeModified;
     bool                                                                        mbPosModified;
     rtl::Reference< StdTabController >                mxTabController;
-    css::uno::Reference< css::util::XModifyListener > mxListener;
+    rtl::Reference< ResourceListener > mxListener;
 
     void        ImplInsertControl( css::uno::Reference< css::awt::XControlModel > const & rxModel, const OUString& rName );
     void        ImplRemoveControl( css::uno::Reference< css::awt::XControlModel > const & rxModel );
diff --git a/toolkit/inc/controls/geometrycontrolmodel.hxx b/toolkit/inc/controls/geometrycontrolmodel.hxx
index c2dc13b49f3f..a2ffeba12fa1 100644
--- a/toolkit/inc/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/controls/geometrycontrolmodel.hxx
@@ -36,7 +36,7 @@ namespace com::sun::star {
         class XComponentContext;
     }
 }
-
+namespace toolkit { class ScriptEventContainer; }
 
 // namespace toolkit
 // {
@@ -56,7 +56,7 @@ namespace com::sun::star {
     protected:
         css::uno::Reference< css::uno::XAggregation >
                     m_xAggregate;
-        css::uno::Reference< css::container::XNameContainer >
+        rtl::Reference< toolkit::ScriptEventContainer >
                     mxEventContainer;
 
         // <properties>
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 51a098bbcd8e..892873048931 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -62,7 +62,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
     mxPrinter.reset();
 }
 
-css::uno::Reference< css::awt::XDevice > const &  VCLXPrinterPropertySet::GetDevice()
+rtl::Reference< VCLXDevice > const &  VCLXPrinterPropertySet::GetDevice()
 {
     if ( !mxPrnDevice.is() )
     {