diff --git a/lib/private/Hooks/Emitter.php b/lib/private/Hooks/Emitter.php
index cd4793ef3f..4240cef520 100644
--- a/lib/private/Hooks/Emitter.php
+++ b/lib/private/Hooks/Emitter.php
@@ -39,6 +39,7 @@ interface Emitter {
 	 * @param string $method
 	 * @param callable $callback
 	 * @return void
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
 	 */
 	public function listen($scope, $method, callable $callback);
 
@@ -47,6 +48,7 @@ interface Emitter {
 	 * @param string $method optional
 	 * @param callable $callback optional
 	 * @return void
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::removeListener
 	 */
 	public function removeListener($scope = null, $method = null, callable $callback = null);
 }
diff --git a/lib/private/Hooks/EmitterTrait.php b/lib/private/Hooks/EmitterTrait.php
index 85efa218f6..1cbfe0f5a0 100644
--- a/lib/private/Hooks/EmitterTrait.php
+++ b/lib/private/Hooks/EmitterTrait.php
@@ -24,6 +24,9 @@
 
 namespace OC\Hooks;
 
+/**
+ * @deprecated 18.0.0 use events and the \OCP\EventDispatcher\IEventDispatcher service
+ */
 trait EmitterTrait {
 
 	/**
@@ -35,6 +38,7 @@ trait EmitterTrait {
 	 * @param string $scope
 	 * @param string $method
 	 * @param callable $callback
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::addListener
 	 */
 	public function listen($scope, $method, callable $callback) {
 		$eventName = $scope . '::' . $method;
@@ -50,6 +54,7 @@ trait EmitterTrait {
 	 * @param string $scope optional
 	 * @param string $method optional
 	 * @param callable $callback optional
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::removeListener
 	 */
 	public function removeListener($scope = null, $method = null, callable $callback = null) {
 		$names = [];
@@ -93,6 +98,7 @@ trait EmitterTrait {
 	 * @param string $scope
 	 * @param string $method
 	 * @param array $arguments optional
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
 	 */
 	protected function emit($scope, $method, array $arguments = []) {
 		$eventName = $scope . '::' . $method;
diff --git a/lib/private/Hooks/PublicEmitter.php b/lib/private/Hooks/PublicEmitter.php
index dbccc34f2e..e698b32218 100644
--- a/lib/private/Hooks/PublicEmitter.php
+++ b/lib/private/Hooks/PublicEmitter.php
@@ -33,6 +33,7 @@ class PublicEmitter extends BasicEmitter {
 	 * @param string $scope
 	 * @param string $method
 	 * @param array $arguments optional
+	 * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
 	 *
 	 * @suppress PhanAccessMethodProtected
 	 */