diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 358b2818fc12..42a375c70238 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -79,6 +79,8 @@ namespace pcr
         return sImageId;
     }
 
+    }
+
     //= OSimpleTabModel
 
     class OSimpleTabModel : public ::cppu::WeakImplHelper< XTabControllerModel>
@@ -102,8 +104,6 @@ namespace pcr
         virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) override {};
     };
 
-    }
-
     //= TabOrderDialog
     TabOrderDialog::TabOrderDialog(weld::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
                     const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB)
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index e43f010e8282..e512cf8e9a90 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -27,10 +27,12 @@
 
 namespace pcr
 {
+    class OSimpleTabModel;
+
     //= TabOrderDialog
     class TabOrderDialog : public weld::GenericDialogController
     {
-        css::uno::Reference< css::awt::XTabControllerModel >
+        rtl::Reference< OSimpleTabModel >
                                     m_xTempModel;
         css::uno::Reference< css::awt::XTabControllerModel >
                                     m_xModel;
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index c2bbca99c982..f3402d33804b 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -83,7 +83,7 @@ namespace {
 struct SaneHolder
 {
     Sane                m_aSane;
-    Reference< css::awt::XBitmap > m_xBitmap;
+    rtl::Reference< BitmapTransporter > m_xBitmap;
     osl::Mutex          m_aProtector;
     ScanError           m_nError;
     bool                m_bBusy;