diff --git a/ruma-client-api/src/r0/presence/get_presence.rs b/ruma-client-api/src/r0/presence/get_presence.rs
index d796bd65..880b077b 100644
--- a/ruma-client-api/src/r0/presence/get_presence.rs
+++ b/ruma-client-api/src/r0/presence/get_presence.rs
@@ -3,7 +3,7 @@
 use std::time::Duration;
 
 use ruma_api::ruma_api;
-use ruma_events::presence::PresenceState;
+use ruma_common::presence::PresenceState;
 use ruma_identifiers::UserId;
 
 ruma_api! {
diff --git a/ruma-client-api/src/r0/presence/set_presence.rs b/ruma-client-api/src/r0/presence/set_presence.rs
index 19b10659..854a5fac 100644
--- a/ruma-client-api/src/r0/presence/set_presence.rs
+++ b/ruma-client-api/src/r0/presence/set_presence.rs
@@ -1,7 +1,7 @@
 //! [PUT /_matrix/client/r0/presence/{userId}/status](https://matrix.org/docs/spec/client_server/r0.6.0#put-matrix-client-r0-presence-userid-status)
 
 use ruma_api::ruma_api;
-use ruma_events::presence::PresenceState;
+use ruma_common::presence::PresenceState;
 use ruma_identifiers::UserId;
 
 ruma_api! {
diff --git a/ruma-client-api/src/r0/push/get_notifications.rs b/ruma-client-api/src/r0/push/get_notifications.rs
index 1b0857b3..b7038950 100644
--- a/ruma-client-api/src/r0/push/get_notifications.rs
+++ b/ruma-client-api/src/r0/push/get_notifications.rs
@@ -4,13 +4,11 @@ use std::time::SystemTime;
 
 use js_int::UInt;
 use ruma_api::ruma_api;
-use ruma_common::Raw;
+use ruma_common::{push::Action, Raw};
 use ruma_events::AnyEvent;
 use ruma_identifiers::RoomId;
 use serde::{Deserialize, Serialize};
 
-use super::Action;
-
 ruma_api! {
     metadata: {
         description: "Paginate through the list of events that the user has been, or would have been notified about.",
diff --git a/ruma-client-api/src/r0/push/get_pushrule_actions.rs b/ruma-client-api/src/r0/push/get_pushrule_actions.rs
index f7752cf0..55e38a68 100644
--- a/ruma-client-api/src/r0/push/get_pushrule_actions.rs
+++ b/ruma-client-api/src/r0/push/get_pushrule_actions.rs
@@ -1,8 +1,9 @@
 //! [GET /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-pushrules-scope-kind-ruleid-actions)
 
 use ruma_api::ruma_api;
+use ruma_common::push::Action;
 
-use super::{Action, RuleKind};
+use super::RuleKind;
 
 ruma_api! {
     metadata: {
diff --git a/ruma-client-api/src/r0/push/set_pushrule.rs b/ruma-client-api/src/r0/push/set_pushrule.rs
index 517ebce9..16ecc13b 100644
--- a/ruma-client-api/src/r0/push/set_pushrule.rs
+++ b/ruma-client-api/src/r0/push/set_pushrule.rs
@@ -1,8 +1,9 @@
 //! [PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}](https://matrix.org/docs/spec/client_server/r0.6.0#put-matrix-client-r0-pushrules-scope-kind-ruleid)
 
 use ruma_api::ruma_api;
+use ruma_common::push::{Action, PushCondition};
 
-use super::{Action, PushCondition, RuleKind};
+use super::RuleKind;
 
 ruma_api! {
     metadata: {
diff --git a/ruma-client-api/src/r0/push/set_pushrule_actions.rs b/ruma-client-api/src/r0/push/set_pushrule_actions.rs
index 4d1e75f3..31d07471 100644
--- a/ruma-client-api/src/r0/push/set_pushrule_actions.rs
+++ b/ruma-client-api/src/r0/push/set_pushrule_actions.rs
@@ -1,8 +1,9 @@
 //! [PUT /_matrix/client/r0/pushrules/{scope}/{kind}/{ruleId}/actions](https://matrix.org/docs/spec/client_server/r0.6.0#put-matrix-client-r0-pushrules-scope-kind-ruleid-actions)
 
 use ruma_api::ruma_api;
+use ruma_common::push::Action;
 
-use super::{Action, RuleKind};
+use super::RuleKind;
 
 ruma_api! {
     metadata: {