diff --git a/ruma-client-api/src/r0/state/get_state_events_for_key.rs b/ruma-client-api/src/r0/state/get_state_events_for_key.rs
index 58e3ed1f..b0c6bff7 100644
--- a/ruma-client-api/src/r0/state/get_state_events_for_key.rs
+++ b/ruma-client-api/src/r0/state/get_state_events_for_key.rs
@@ -1,7 +1,6 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-state-eventtype-statekey)
 
-use bytes::BufMut;
-use ruma_api::{ruma_api, SendAccessToken};
+use ruma_api::ruma_api;
 use ruma_events::{AnyStateEventContent, EventType};
 use ruma_identifiers::RoomId;
 use ruma_serde::{Outgoing, Raw};
@@ -66,10 +65,10 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
 
     const METADATA: ruma_api::Metadata = METADATA;
 
-    fn try_into_http_request<T: Default + BufMut>(
+    fn try_into_http_request<T: Default + bytes::BufMut>(
         self,
         base_url: &str,
-        access_token: SendAccessToken<'_>,
+        access_token: ruma_api::SendAccessToken<'_>,
     ) -> Result<http::Request<T>, ruma_api::error::IntoHttpError> {
         use std::borrow::Cow;
 
diff --git a/ruma-client-api/src/r0/state/send_state_event.rs b/ruma-client-api/src/r0/state/send_state_event.rs
index bc668028..eb1a254f 100644
--- a/ruma-client-api/src/r0/state/send_state_event.rs
+++ b/ruma-client-api/src/r0/state/send_state_event.rs
@@ -1,7 +1,6 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#put-matrix-client-r0-rooms-roomid-state-eventtype-statekey)
 
-use bytes::BufMut;
-use ruma_api::{ruma_api, SendAccessToken};
+use ruma_api::ruma_api;
 use ruma_events::{AnyStateEventContent, EventContent as _};
 use ruma_identifiers::{EventId, RoomId};
 use ruma_serde::{Outgoing, Raw};
@@ -75,10 +74,10 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> {
 
     const METADATA: ruma_api::Metadata = METADATA;
 
-    fn try_into_http_request<T: Default + BufMut>(
+    fn try_into_http_request<T: Default + bytes::BufMut>(
         self,
         base_url: &str,
-        access_token: SendAccessToken<'_>,
+        access_token: ruma_api::SendAccessToken<'_>,
     ) -> Result<http::Request<T>, ruma_api::error::IntoHttpError> {
         use std::borrow::Cow;