diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index f66277874963..085782a03113 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpe
 $(eval $(call gb_Library_use_sdk_api,ucpexpand1))
 
 $(eval $(call gb_Library_use_libraries,ucpexpand1,\
+	comphelper \
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 5b880a3d2a4d..2838c5cb728b 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -20,9 +20,8 @@
 
 #include <rtl/uri.hxx>
 #include <osl/mutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <ucbhelper/content.hxx>
@@ -42,11 +41,11 @@ using namespace ::com::sun::star;
 namespace
 {
 
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
     lang::XServiceInfo, ucb::XContentProvider > t_impl_helper;
 
 
-class ExpandContentProviderImpl : protected cppu::BaseMutex, public t_impl_helper
+class ExpandContentProviderImpl : public t_impl_helper
 {
     uno::Reference< uno::XComponentContext > m_xComponentContext;
     uno::Reference< util::XMacroExpander >   m_xMacroExpander;
@@ -55,13 +54,11 @@ class ExpandContentProviderImpl : protected cppu::BaseMutex, public t_impl_helpe
 
 protected:
     void check() const;
-    virtual void SAL_CALL disposing() override;
 
 public:
     explicit ExpandContentProviderImpl(
         uno::Reference< uno::XComponentContext > const & xComponentContext )
-        : t_impl_helper( m_aMutex ),
-          m_xComponentContext( xComponentContext ),
+        : m_xComponentContext( xComponentContext ),
           m_xMacroExpander( util::theMacroExpander::get(xComponentContext) )
         {}
 
@@ -83,7 +80,7 @@ void ExpandContentProviderImpl::check() const
 {
     // xxx todo guard?
 //     MutexGuard guard( m_mutex );
-    if (rBHelper.bInDispose || rBHelper.bDisposed)
+    if (m_bDisposed)
     {
         throw lang::DisposedException(
             "expand content provider instance has "
@@ -93,11 +90,6 @@ void ExpandContentProviderImpl::check() const
     }
 }
 
-void ExpandContentProviderImpl::disposing()
-{
-}
-
-
 // XServiceInfo
 
 OUString ExpandContentProviderImpl::getImplementationName()