diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 63d240b5b983..791abdf33dec 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -38,6 +38,7 @@
 #include <rtl/ref.hxx>
 #include <unordered_map>
 
+class PropertySetRegistry;
 
 using UcbStore_Base = comphelper::WeakComponentImplHelper <
                         css::lang::XServiceInfo,
@@ -48,7 +49,7 @@ class UcbStore : public UcbStore_Base
 {
     css::uno::Reference< css::uno::XComponentContext >    m_xContext;
     css::uno::Sequence< css::uno::Any >                   m_aInitArgs;
-    css::uno::Reference< css::ucb::XPropertySetRegistry > m_xTheRegistry;
+    rtl::Reference< PropertySetRegistry >                 m_xTheRegistry;
 
 public:
     explicit UcbStore( const css::uno::Reference< css::uno::XComponentContext >& xContext );
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 4039c955897c..77e7772db7e2 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -193,7 +193,7 @@ FileProvider::createContentIdentifier(
 
 //XPropertySetInfoImpl
 
-namespace {
+namespace fileaccess {
 
 class XPropertySetInfoImpl2
     : public cppu::OWeakObject,
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 530010be1f4d..311c1be0e469 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/XFileIdentifierConverter.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
 #include <memory>
 #include <mutex>
 
@@ -39,6 +40,7 @@ namespace fileaccess {
 
     class BaseContent;
     class TaskManager;
+    class XPropertySetInfoImpl2;
 
     class FileProvider: public cppu::WeakImplHelper <
         css::lang::XServiceInfo,
@@ -147,7 +149,7 @@ namespace fileaccess {
         OUString m_HomeDirectory;
         sal_Int32     m_FileSystemNotation;
 
-        css::uno::Reference< css::beans::XPropertySetInfo >     m_xPropertySetInfo;
+        rtl::Reference< XPropertySetInfoImpl2 >                 m_xPropertySetInfo;
 
         std::unique_ptr<TaskManager>                            m_pMyShell;
     };