diff --git a/src/event_kinds.rs b/src/event_kinds.rs
index 62ae9f29..ce6fd495 100644
--- a/src/event_kinds.rs
+++ b/src/event_kinds.rs
@@ -4,8 +4,8 @@ use ruma_events_macros::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
 
 use crate::{
-    BasicEventContent, EphemeralRoomEventContent, MessageEventContent, StateEventContent,
-    ToDeviceEventContent, UnsignedData,
+    BasicEventContent, EphemeralRoomEventContent, EventContent, MessageEventContent,
+    StateEventContent, UnsignedData,
 };
 
 /// A basic event – one that consists only of it's type and the `content` object.
@@ -79,7 +79,7 @@ pub struct StateEvent<C: StateEventContent> {
 }
 
 #[derive(Clone, Debug, Event)]
-pub struct ToDeviceEvent<C: ToDeviceEventContent> {
+pub struct ToDeviceEvent<C: EventContent> {
     /// Data specific to the event type.
     pub content: C,
 
diff --git a/src/lib.rs b/src/lib.rs
index d8e70fad..1469d909 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -234,6 +234,3 @@ pub trait MessageEventContent: RoomEventContent {}
 
 /// Marker trait for the content of a state event.
 pub trait StateEventContent: RoomEventContent {}
-
-/// Marker trait for event content types that are commonly sent using to-device messaging.
-pub trait ToDeviceEventContent: EventContent {}