diff --git a/lib/db_ido/dbtype.hpp b/lib/db_ido/dbtype.hpp
index 534062218..68fe25152 100644
--- a/lib/db_ido/dbtype.hpp
+++ b/lib/db_ido/dbtype.hpp
@@ -61,9 +61,7 @@ private:
  *
  * @ingroup ido
  */
-class DbTypeRegistry : public Registry<DbType::Ptr>
-{
-};
+using DbTypeRegistry = Registry<DbType::Ptr>;
 
 /**
  * Factory function for DbObject-based classes.
diff --git a/lib/remote/apiaction.hpp b/lib/remote/apiaction.hpp
index 2ce8ff153..8d803d04f 100644
--- a/lib/remote/apiaction.hpp
+++ b/lib/remote/apiaction.hpp
@@ -45,9 +45,7 @@ private:
  *
  * @ingroup remote
  */
-class ApiActionRegistry : public Registry<ApiAction::Ptr>
-{
-};
+using ApiActionRegistry = Registry<ApiAction::Ptr>;
 
 #define REGISTER_APIACTION(name, types, callback) \
 	INITIALIZE_ONCE([]() { \
diff --git a/lib/remote/apifunction.hpp b/lib/remote/apifunction.hpp
index b9cee1eee..2b0f3ed00 100644
--- a/lib/remote/apifunction.hpp
+++ b/lib/remote/apifunction.hpp
@@ -47,9 +47,7 @@ private:
  *
  * @ingroup base
  */
-class ApiFunctionRegistry : public Registry<ApiFunction::Ptr>
-{
-};
+using ApiFunctionRegistry = Registry<ApiFunction::Ptr>;
 
 #define REGISTER_APIFUNCTION(name, ns, callback) \
 	INITIALIZE_ONCE([]() { \
diff --git a/lib/remote/eventqueue.hpp b/lib/remote/eventqueue.hpp
index da4737b04..7b8b7e941 100644
--- a/lib/remote/eventqueue.hpp
+++ b/lib/remote/eventqueue.hpp
@@ -59,9 +59,7 @@ private:
  *
  * @ingroup base
  */
-class EventQueueRegistry : public Registry<EventQueue::Ptr>
-{
-};
+using EventQueueRegistry = Registry<EventQueue::Ptr>;
 
 enum class EventType : uint_fast8_t
 {