diff --git a/src/pubsub/event.rs b/src/pubsub/event.rs
index 8ac16cafd3eab5c7ce5b54d311ee8e4a258cb0a9..dea11ba446daf99dffad2ede856084326250fc07 100644
--- a/src/pubsub/event.rs
+++ b/src/pubsub/event.rs
@@ -16,9 +16,7 @@ use ns;
 
 use data_forms::DataForm;
 
-generate_id!(NodeName);
-generate_id!(ItemId);
-generate_id!(SubscriptionId);
+use pubsub::{NodeName, ItemId, SubscriptionId};
 
 #[derive(Debug, Clone)]
 pub struct Item {
diff --git a/src/pubsub/mod.rs b/src/pubsub/mod.rs
index 9eb939442e863cabae522697569d5da6ac324f00..89b6f8ce951ca89cc8a697e794f1d19841efdf6c 100644
--- a/src/pubsub/mod.rs
+++ b/src/pubsub/mod.rs
@@ -7,3 +7,7 @@
 pub mod event;
 
 pub use self::event::PubSubEvent;
+
+generate_id!(NodeName);
+generate_id!(ItemId);
+generate_id!(SubscriptionId);