diff --git a/Makefile b/Makefile
index 67282f2..3f50d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ qa: analyze test
 analyze:
 	@cargo clippy
 	@cargo fmt --check
+	@cargo doc --all-features --no-deps --document-private-items
 
 test:
 	@cargo test
diff --git a/src/event.rs b/src/event.rs
index be7fe0f..25a23f8 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -11,4 +11,4 @@ pub use event_types::management_event::ManagementEvent;
 pub use trace_info::TraceInfo;
 
 #[cfg(feature = "cloudevents")]
-use crate::error::EventError;
+pub use crate::error::EventError;
diff --git a/src/event/event_types/event.rs b/src/event/event_types/event.rs
index 93ed39d..72cf3d4 100644
--- a/src/event/event_types/event.rs
+++ b/src/event/event_types/event.rs
@@ -3,6 +3,8 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 use crate::event::{EventCandidate, trace_info::TraceInfo};
+#[cfg(feature = "cloudevents")]
+use cloudevents::EventBuilder;
 
 /// Represents an event that has been received from the DB.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
diff --git a/src/event/event_types/event_candidate.rs b/src/event/event_types/event_candidate.rs
index d680348..27e209d 100644
--- a/src/event/event_types/event_candidate.rs
+++ b/src/event/event_types/event_candidate.rs
@@ -5,6 +5,8 @@ use typed_builder::TypedBuilder;
 
 #[cfg(feature = "cloudevents")]
 use crate::error::EventError;
+#[cfg(feature = "cloudevents")]
+use cloudevents::AttributesReader;
 
 /// Represents an event candidate that can be sent to the DB.
 /// This is a simplified version of the [`super::event::Event`] type.
diff --git a/src/event/event_types/management_event.rs b/src/event/event_types/management_event.rs
index 56c34dd..db9e85c 100644
--- a/src/event/event_types/management_event.rs
+++ b/src/event/event_types/management_event.rs
@@ -2,6 +2,9 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+#[cfg(feature = "cloudevents")]
+use cloudevents::EventBuilder;
+
 /// Represents a management event that has been received from the DB.
 ///
 /// For management requests like [`crate::client::Client::ping`] and [`crate::client::Client::verify_api_token`] the DB will send a management event.
diff --git a/src/event/trace_info.rs b/src/event/trace_info.rs
index 598a415..ab6aa41 100644
--- a/src/event/trace_info.rs
+++ b/src/event/trace_info.rs
@@ -2,6 +2,9 @@
 
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "cloudevents")]
+use crate::error::EventError;
+
 /// Represents the trace information of an event.
 /// This is used for distributed tracing.
 /// It can either be a traceparent or a traceparent and tracestate.