diff --git a/src/core/qsmenu.hpp b/src/core/qsmenu.hpp
index b5a2cded..a088eacd 100644
--- a/src/core/qsmenu.hpp
+++ b/src/core/qsmenu.hpp
@@ -140,7 +140,7 @@ class QsMenuOpener: public QObject {
 	/// The menu to retrieve children from.
 	Q_PROPERTY(qs::menu::QsMenuHandle* menu READ menu WRITE setMenu NOTIFY menuChanged);
 	/// The children of the given menu.
-	Q_PROPERTY(QQmlListProperty<QsMenuEntry> children READ children NOTIFY childrenChanged);
+	Q_PROPERTY(QQmlListProperty<qs::menu::QsMenuEntry> children READ children NOTIFY childrenChanged);
 	QML_ELEMENT;
 
 public:
diff --git a/src/services/mpris/player.hpp b/src/services/mpris/player.hpp
index 3498a746..47ea7922 100644
--- a/src/services/mpris/player.hpp
+++ b/src/services/mpris/player.hpp
@@ -29,7 +29,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(MprisPlaybackState::Enum status);
+	Q_INVOKABLE static QString toString(qs::service::mpris::MprisPlaybackState::Enum status);
 };
 
 ///! Loop state of an MprisPlayer
@@ -47,7 +47,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(MprisLoopState::Enum status);
+	Q_INVOKABLE static QString toString(qs::service::mpris::MprisLoopState::Enum status);
 };
 
 ///! A media player exposed over MPRIS.
diff --git a/src/services/notifications/notification.hpp b/src/services/notifications/notification.hpp
index e647b3dd..21b5b95a 100644
--- a/src/services/notifications/notification.hpp
+++ b/src/services/notifications/notification.hpp
@@ -30,7 +30,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(NotificationUrgency::Enum value);
+	Q_INVOKABLE static QString toString(qs::service::notifications::NotificationUrgency::Enum value);
 };
 
 ///! The reason a Notification was closed.
@@ -51,7 +51,8 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(NotificationCloseReason::Enum value);
+	Q_INVOKABLE static QString
+	toString(qs::service::notifications::NotificationCloseReason::Enum value);
 };
 
 class NotificationAction;
@@ -149,7 +150,7 @@ signals:
 	/// Sent when a notification has been closed.
 	///
 	/// The notification object will be destroyed as soon as all signal handlers exit.
-	void closed(NotificationCloseReason::Enum reason);
+	void closed(qs::service::notifications::NotificationCloseReason::Enum reason);
 
 	void trackedChanged();
 	void expireTimeoutChanged();
diff --git a/src/services/notifications/qml.hpp b/src/services/notifications/qml.hpp
index 3f5f34c0..d7502101 100644
--- a/src/services/notifications/qml.hpp
+++ b/src/services/notifications/qml.hpp
@@ -114,7 +114,7 @@ signals:
 	/// Sent when a notification is received by the server.
 	///
 	/// If this notification should not be discarded, set its `tracked` property to true.
-	void notification(Notification* notification);
+	void notification(qs::service::notifications::Notification* notification);
 
 	void keepOnReloadChanged();
 	void persistenceSupportedChanged();
diff --git a/src/services/pipewire/link.hpp b/src/services/pipewire/link.hpp
index 01c9e60f..0c7bde29 100644
--- a/src/services/pipewire/link.hpp
+++ b/src/services/pipewire/link.hpp
@@ -32,7 +32,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(PwLinkState::Enum value);
+	Q_INVOKABLE static QString toString(qs::service::pipewire::PwLinkState::Enum value);
 };
 
 constexpr const char TYPE_INTERFACE_Link[] = PW_TYPE_INTERFACE_Link;             // NOLINT
diff --git a/src/services/pipewire/node.hpp b/src/services/pipewire/node.hpp
index 29c02033..783614ac 100644
--- a/src/services/pipewire/node.hpp
+++ b/src/services/pipewire/node.hpp
@@ -84,7 +84,7 @@ public:
 
 	/// Print a human readable representation of the given channel,
 	/// including aux and custom channel ranges.
-	Q_INVOKABLE static QString toString(PwAudioChannel::Enum value);
+	Q_INVOKABLE static QString toString(qs::service::pipewire::PwAudioChannel::Enum value);
 };
 
 enum class PwNodeType {
diff --git a/src/services/upower/device.hpp b/src/services/upower/device.hpp
index af0f0c37..c971dd0e 100644
--- a/src/services/upower/device.hpp
+++ b/src/services/upower/device.hpp
@@ -33,7 +33,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(UPowerDeviceState::Enum status);
+	Q_INVOKABLE static QString toString(qs::service::upower::UPowerDeviceState::Enum status);
 };
 
 ///! Type of a UPower device.
@@ -77,7 +77,7 @@ public:
 	};
 	Q_ENUM(Enum);
 
-	Q_INVOKABLE static QString toString(UPowerDeviceType::Enum type);
+	Q_INVOKABLE static QString toString(qs::service::upower::UPowerDeviceType::Enum type);
 };
 
 ///! A device exposed through the UPower system service.
diff --git a/src/wayland/hyprland/ipc/qml.hpp b/src/wayland/hyprland/ipc/qml.hpp
index 72bb4e14..1fc93c38 100644
--- a/src/wayland/hyprland/ipc/qml.hpp
+++ b/src/wayland/hyprland/ipc/qml.hpp
@@ -63,7 +63,7 @@ signals:
 	/// Emitted for every event that comes in through the hyprland event socket (socket2).
 	///
 	/// See [Hyprland Wiki: IPC](https://wiki.hyprland.org/IPC/) for a list of events.
-	void rawEvent(HyprlandIpcEvent* event);
+	void rawEvent(qs::hyprland::ipc::HyprlandIpcEvent* event);
 
 	void focusedMonitorChanged();
 };