3 files changed, 18 insertions, 6 deletions
diff --git a/bridges/inc/bridge.hxx b/bridges/inc/bridge.hxx
index 5e3b146217b0..a01bb42bc163 100644
--- a/bridges/inc/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
 #define INCLUDED_BRIDGES_INC_BRIDGE_HXX
 
-#include "osl/interlck.h"
+#include <sal/config.h>
+
+#include <atomic>
+#include <cstddef>
+
 #include "sal/types.h"
 #include "typelib/typedescription.h"
 #include "uno/environment.h"
@@ -90,7 +94,7 @@ private:
         Bridge * pBridge;
     };
 
-    oslInterlockedCount nRef;
+    std::atomic<std::size_t> nRef;
 
     uno_ExtEnvironment * pCppEnv;
     uno_ExtEnvironment * pUnoEnv;
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index ccd83660059a..00972829a53c 100644
--- a/bridges/inc/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include <sal/config.h>
+
+#include <atomic>
+#include <cstddef>
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -84,7 +88,7 @@ private:
     static com::sun::star::uno::XInterface * castProxyToInterface(
         CppInterfaceProxy * pProxy);
 
-    oslInterlockedCount nRef;
+    std::atomic<std::size_t> nRef;
     Bridge * pBridge;
 
     // mapping information
diff --git a/bridges/inc/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index c9697d3491a8..c76b62dd28b0 100644
--- a/bridges/inc/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -20,7 +20,11 @@
 #ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 #define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 
-#include "osl/interlck.h"
+#include <sal/config.h>
+
+#include <atomic>
+#include <cstddef>
+
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "typelib/typedescription.h"
@@ -83,7 +87,7 @@ private:
 
     ~UnoInterfaceProxy();
 
-    oslInterlockedCount nRef;
+    std::atomic<std::size_t> nRef;
     Bridge * pBridge;
 
     // mapping information