diff --git a/modules/gui/qt/network/addonsmodel.cpp b/modules/gui/qt/network/addonsmodel.cpp
index 46acd7a26e..5034ae64ba 100644
--- a/modules/gui/qt/network/addonsmodel.cpp
+++ b/modules/gui/qt/network/addonsmodel.cpp
@@ -59,8 +59,8 @@ CHECK_ADDON_STATE_MATCH(UNINSTALLING);
 
 namespace {
 
-using AddonPtr = vlc_shared_data_ptr_type(addon_entry_t,
-                                          addon_entry_Hold, addon_entry_Release);
+using AddonPtr = ::vlc::vlc_shared_data_ptr<addon_entry_t,
+                                     &addon_entry_Hold, &addon_entry_Release>;
 
 class AddonItem {
 public:
diff --git a/modules/gui/qt/network/vlcmediasourcewrapper.hpp b/modules/gui/qt/network/vlcmediasourcewrapper.hpp
index f606dd7509..9550f90763 100644
--- a/modules/gui/qt/network/vlcmediasourcewrapper.hpp
+++ b/modules/gui/qt/network/vlcmediasourcewrapper.hpp
@@ -24,13 +24,13 @@
 #include <vlc_media_source.h>
 #include <vlc_cxx_helpers.hpp>
 
-using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
-                                                vlc_media_source_Hold,
-                                                vlc_media_source_Release);
+using MediaSourcePtr = ::vlc::vlc_shared_data_ptr<vlc_media_source_t,
+                                                  &vlc_media_source_Hold,
+                                                  &vlc_media_source_Release>;
 
-using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t,
-                                              vlc_media_tree_Hold,
-                                              vlc_media_tree_Release);
+using MediaTreePtr = ::vlc::vlc_shared_data_ptr<vlc_media_tree_t,
+                                                &vlc_media_tree_Hold,
+                                                &vlc_media_tree_Release>;
 
 class MediaTreeLocker
 {
diff --git a/modules/gui/qt/player/input_models.hpp b/modules/gui/qt/player/input_models.hpp
index a79a23540b..47776a882c 100644
--- a/modules/gui/qt/player/input_models.hpp
+++ b/modules/gui/qt/player/input_models.hpp
@@ -90,7 +90,7 @@ private:
 
         QString m_title;
         //vlc_es_id_t *m_id = NULL;
-        vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_id;
+        ::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_id;
         bool m_selected = false;
     };
     QList<Data> m_data;
@@ -139,7 +139,7 @@ signals:
 
 private:
     vlc_player_t* m_player;
-    typedef vlc_shared_data_ptr_type(vlc_player_title_list, vlc_player_title_list_Hold, vlc_player_title_list_Release) PlayerTitleList;
+    typedef ::vlc::vlc_shared_data_ptr<vlc_player_title_list, &vlc_player_title_list_Hold, &vlc_player_title_list_Release> PlayerTitleList;
     PlayerTitleList m_titleList;
     int m_current = -1;
     int m_count = 0;
diff --git a/modules/gui/qt/player/player_controller.cpp b/modules/gui/qt/player/player_controller.cpp
index 4bb455dba2..5e4e53c393 100644
--- a/modules/gui/qt/player/player_controller.cpp
+++ b/modules/gui/qt/player/player_controller.cpp
@@ -49,13 +49,13 @@
 
 //PlayerController private implementation
 
-using SharedEsId = vlc_shared_data_ptr_type(vlc_es_id_t,
-                                            vlc_es_id_Hold,
-                                            vlc_es_id_Release);
+using SharedEsId = ::vlc::vlc_shared_data_ptr<vlc_es_id_t,
+                                              &vlc_es_id_Hold,
+                                              &vlc_es_id_Release>;
 
-using SharedTitleList = vlc_shared_data_ptr_type(vlc_player_title_list,
-                                                 vlc_player_title_list_Hold,
-                                                 vlc_player_title_list_Release);
+using SharedTitleList = ::vlc::vlc_shared_data_ptr<vlc_player_title_list,
+                                                   &vlc_player_title_list_Hold,
+                                                   &vlc_player_title_list_Release>;
 
 PlayerControllerPrivate::~PlayerControllerPrivate()
 {
diff --git a/modules/gui/qt/player/player_controller.hpp b/modules/gui/qt/player/player_controller.hpp
index 7fc4c4cc0b..6d98a8d048 100644
--- a/modules/gui/qt/player/player_controller.hpp
+++ b/modules/gui/qt/player/player_controller.hpp
@@ -38,8 +38,8 @@ Q_MOC_INCLUDE("util/renderer_manager.hpp")
 
 using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>;
 
-using SharedVOutThread = vlc_shared_data_ptr_type(vout_thread_t, vout_Hold, vout_Release);
-using SharedAOut = vlc_shared_data_ptr_type(audio_output_t, aout_Hold, aout_Release);
+using SharedVOutThread = ::vlc::vlc_shared_data_ptr<vout_thread_t, &vout_Hold, &vout_Release>;
+using SharedAOut = ::vlc::vlc_shared_data_ptr<audio_output_t, &aout_Hold, &aout_Release>;
 
 class RendererManager;
 class QSignalMapper;
diff --git a/modules/gui/qt/player/player_controller_p.hpp b/modules/gui/qt/player/player_controller_p.hpp
index 75f825d1b3..afd5e9be13 100644
--- a/modules/gui/qt/player/player_controller_p.hpp
+++ b/modules/gui/qt/player/player_controller_p.hpp
@@ -120,7 +120,7 @@ public:
     TrackListModel m_audioTracks;
     TrackListModel m_subtitleTracks;
 
-    vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_secondarySpuEsId;
+    ::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_secondarySpuEsId;
 
     VLCDuration  m_audioDelay;
     VLCDuration  m_subtitleDelay;
diff --git a/modules/gui/qt/playlist/playlist_item.hpp b/modules/gui/qt/playlist/playlist_item.hpp
index 2ab5265dbb..a0b03eb966 100644
--- a/modules/gui/qt/playlist/playlist_item.hpp
+++ b/modules/gui/qt/playlist/playlist_item.hpp
@@ -34,9 +34,9 @@
 //namespace vlc {
 //  namespace playlist {
 
-using SharedPlaylistItem = vlc_shared_data_ptr_type(vlc_playlist_item_t,
-                                                    vlc_playlist_item_Hold,
-                                                    vlc_playlist_item_Release);
+using SharedPlaylistItem = ::vlc::vlc_shared_data_ptr<vlc_playlist_item_t,
+                                                      &vlc_playlist_item_Hold,
+                                                      &vlc_playlist_item_Release>;
 
 /**
  * Playlist item wrapper.
diff --git a/modules/gui/qt/tests/test_renderer_manager_model.cpp b/modules/gui/qt/tests/test_renderer_manager_model.cpp
index 3816fee35f..5e2450213b 100644
--- a/modules/gui/qt/tests/test_renderer_manager_model.cpp
+++ b/modules/gui/qt/tests/test_renderer_manager_model.cpp
@@ -22,9 +22,9 @@
 
 #include "../util/renderer_manager.hpp"
 
-using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t,
-    vlc_renderer_item_hold,
-    vlc_renderer_item_release);
+using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t,
+    &vlc_renderer_item_hold,
+    &vlc_renderer_item_release>;
 
 class TestClass : public QObject
 {
diff --git a/modules/gui/qt/util/renderer_manager.cpp b/modules/gui/qt/util/renderer_manager.cpp
index 972c2fae9d..33c354ec6c 100644
--- a/modules/gui/qt/util/renderer_manager.cpp
+++ b/modules/gui/qt/util/renderer_manager.cpp
@@ -33,7 +33,7 @@
 
 static void player_renderer_changed(vlc_player_t *, vlc_renderer_item_t *new_item, void *data);
 
-using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t, vlc_renderer_item_hold, vlc_renderer_item_release);
+using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t, &vlc_renderer_item_hold, &vlc_renderer_item_release>;
 using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>;
 
 struct ItemEntry
diff --git a/modules/gui/qt/util/shared_input_item.hpp b/modules/gui/qt/util/shared_input_item.hpp
index d69fe9f7b4..e5fe5ff6e5 100644
--- a/modules/gui/qt/util/shared_input_item.hpp
+++ b/modules/gui/qt/util/shared_input_item.hpp
@@ -30,9 +30,9 @@
 #include <vlc_cxx_helpers.hpp>
 
 
-using SharedInputItem = vlc_shared_data_ptr_type(input_item_t,
-                                                 input_item_Hold,
-                                                 input_item_Release);
+using SharedInputItem = ::vlc::vlc_shared_data_ptr<input_item_t,
+                                                   &input_item_Hold,
+                                                   &input_item_Release>;
 
 Q_DECLARE_METATYPE(SharedInputItem)
 
diff --git a/modules/gui/qt/util/varcommon_p.hpp b/modules/gui/qt/util/varcommon_p.hpp
index 6839d528be..feb4357c5b 100644
--- a/modules/gui/qt/util/varcommon_p.hpp
+++ b/modules/gui/qt/util/varcommon_p.hpp
@@ -89,7 +89,7 @@ public:
 private:
     static void obj_hold( vout_thread_t* obj ) { vout_Hold(obj); }
     static void obj_release( vout_thread_t* obj ) { vout_Release(obj); }
-    typedef vlc_shared_data_ptr_type(vout_thread_t, obj_hold, obj_release) SharedPtr;
+    typedef ::vlc::vlc_shared_data_ptr<vout_thread_t, &obj_hold, &obj_release> SharedPtr;
     SharedPtr m_object;
 };
 
@@ -149,7 +149,7 @@ public:
 private:
     static void obj_hold( audio_output_t* obj ) { aout_Hold(obj); }
     static void obj_release( audio_output_t* obj ) { aout_Release(obj); }
-    typedef vlc_shared_data_ptr_type(audio_output_t, obj_hold, obj_release) SharedPtr;
+    typedef ::vlc::vlc_shared_data_ptr<audio_output_t, &obj_hold, &obj_release> SharedPtr;
     SharedPtr m_object;
 };
 
diff --git a/modules/misc/medialibrary/fs/directory.cpp b/modules/misc/medialibrary/fs/directory.cpp
index ffc899258f..e64d09a702 100644
--- a/modules/misc/medialibrary/fs/directory.cpp
+++ b/modules/misc/medialibrary/fs/directory.cpp
@@ -41,9 +41,9 @@
 #include <system_error>
 #include <vector>
 
-using InputItemPtr = vlc_shared_data_ptr_type(input_item_t,
-                                              input_item_Hold,
-                                              input_item_Release);
+using InputItemPtr = ::vlc::vlc_shared_data_ptr<input_item_t,
+                                                &input_item_Hold,
+                                                &input_item_Release>;
 
 namespace vlc {
   namespace medialibrary {
diff --git a/src/test/shared_data_ptr.cpp b/src/test/shared_data_ptr.cpp
index 2ce5800a41..e9b9cdc446 100644
--- a/src/test/shared_data_ptr.cpp
+++ b/src/test/shared_data_ptr.cpp
@@ -21,7 +21,7 @@ static void mockrc_Release(mockrc *p)
     p->count--;
 }
 
-using MockRcPtr = vlc_shared_data_ptr_type(mockrc, mockrc_Hold, mockrc_Release);
+using MockRcPtr = ::vlc::vlc_shared_data_ptr<mockrc, &mockrc_Hold, &mockrc_Release>;
 
 static void test_raii()
 {