diff --git a/parsers/examples/generate-caps.rs b/parsers/examples/generate-caps.rs
index 9c06169dabc840d7e9850f8b083a98a19eb47002..8e6491159ce37417578bca1db8553a07823abbdd 100644
--- a/parsers/examples/generate-caps.rs
+++ b/parsers/examples/generate-caps.rs
@@ -11,7 +11,8 @@ use xmpp_parsers::{
     disco::DiscoInfoResult,
     ecaps2::{compute_disco as compute_disco_ecaps2, hash_ecaps2, ECaps2},
     hashes::Algo,
-    Element, Error,
+    minidom::Element,
+    Error,
 };
 
 fn get_caps(disco: &DiscoInfoResult, node: String) -> Result<Caps, String> {
diff --git a/parsers/src/attention.rs b/parsers/src/attention.rs
index c94bd54c8e7ea3c09d1ca9aded149edb8e6a37bd..00a32d14303f3912721979af66df9a5049af261b 100644
--- a/parsers/src/attention.rs
+++ b/parsers/src/attention.rs
@@ -18,7 +18,7 @@ impl MessagePayload for Attention {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     #[cfg(not(feature = "disable-validation"))]
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/avatar.rs b/parsers/src/avatar.rs
index b4af78a3cf0e3b7108c2fc61af7ca8931d97df76..afc1278adbcb65c2507cb4812245510f19f67d68 100644
--- a/parsers/src/avatar.rs
+++ b/parsers/src/avatar.rs
@@ -66,7 +66,7 @@ impl PubSubPayload for Data {}
 mod tests {
     use super::*;
     use crate::hashes::Algo;
-    use crate::Element;
+    use minidom::Element;
     #[cfg(not(feature = "disable-validation"))]
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/bind.rs b/parsers/src/bind.rs
index 5d4d0aaeceb5fd1b52ebb10993659e65e3a9f892..8b44d0aed8b25f260d5acac07a438a7fe194d106 100644
--- a/parsers/src/bind.rs
+++ b/parsers/src/bind.rs
@@ -6,8 +6,8 @@
 
 use crate::iq::{IqResultPayload, IqSetPayload};
 use crate::ns;
-use crate::Element;
 use jid::{FullJid, Jid};
+use minidom::Element;
 use std::str::FromStr;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/bind2.rs b/parsers/src/bind2.rs
index be4bc9ca1e22f6c630ccd3f1ef2a63894bf26681..fa72cd8a9b9f87f1774f3cd158c4d9d3f2aef03c 100644
--- a/parsers/src/bind2.rs
+++ b/parsers/src/bind2.rs
@@ -6,7 +6,7 @@
 
 use crate::mam;
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 /// Represents the `<bind/>` element, as sent by the server in SASL 2 to advertise which features
@@ -180,7 +180,6 @@ impl From<Bound> for Element {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/blocking.rs b/parsers/src/blocking.rs
index 223426a7a197c62223a179a262f5b2d6871edb7e..e7b1297ab1cbba562f5c39b1c81b8a595350180d 100644
--- a/parsers/src/blocking.rs
+++ b/parsers/src/blocking.rs
@@ -8,8 +8,8 @@ use xso::{AsXml, FromXml};
 
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use xso::error::FromElementError;
 
 /// The element requesting the blocklist, the result iq will contain a
diff --git a/parsers/src/bob.rs b/parsers/src/bob.rs
index b2221e2c2e347c3e132b1bb9747bb75f150eae72..7988fd301e3084ff094dd2210e47714a2422d9cb 100644
--- a/parsers/src/bob.rs
+++ b/parsers/src/bob.rs
@@ -114,7 +114,7 @@ pub struct Data {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::FromElementError;
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/bookmarks.rs b/parsers/src/bookmarks.rs
index aa92444208de14ac827ce677b07bb93cef76e13d..7b4769b37789430a037685b7ba3b38f6cd9ddeff 100644
--- a/parsers/src/bookmarks.rs
+++ b/parsers/src/bookmarks.rs
@@ -98,7 +98,7 @@ impl Storage {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/bookmarks2.rs b/parsers/src/bookmarks2.rs
index 8026cf57b6f2d8a2c340b2be6285890e7f8bae30..f55cecd880e56078102fd14bb6299b1eb249f2e7 100644
--- a/parsers/src/bookmarks2.rs
+++ b/parsers/src/bookmarks2.rs
@@ -15,7 +15,7 @@
 //! This module exposes the [`Autojoin`][crate::bookmarks2::Autojoin] boolean flag, the [`Conference`][crate::bookmarks2::Conference] chatroom element, and the [BOOKMARKS2][crate::ns::BOOKMARKS2] XML namespace.
 
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 generate_attribute!(
diff --git a/parsers/src/caps.rs b/parsers/src/caps.rs
index 77f7b30dde3ddc8d05afecfab6519aafcb6bc350..d21dea82f0abb81911cc417f3258c32781310b91 100644
--- a/parsers/src/caps.rs
+++ b/parsers/src/caps.rs
@@ -9,10 +9,10 @@ use crate::disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity};
 use crate::hashes::{Algo, Hash};
 use crate::ns;
 use crate::presence::PresencePayload;
-use crate::Element;
 use base64::{engine::general_purpose::STANDARD as Base64, Engine};
 use blake2::Blake2bVar;
 use digest::{Digest, Update, VariableOutput};
+use minidom::Element;
 use sha1::Sha1;
 use sha2::{Sha256, Sha512};
 use sha3::{Sha3_256, Sha3_512};
diff --git a/parsers/src/carbons.rs b/parsers/src/carbons.rs
index 9fdcc88f09dda5fa21fa3348ce4a11aad4dffdb7..8baf50902528864dc6b73678c9f6e81da86efcac 100644
--- a/parsers/src/carbons.rs
+++ b/parsers/src/carbons.rs
@@ -60,7 +60,7 @@ impl MessagePayload for Sent {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/cert_management.rs b/parsers/src/cert_management.rs
index 4e3fb87a8720694ec0a45be23efc6e4032d4a4f8..92f5bee8ff03aa42f0e2bd61c36868930d1f6abc 100644
--- a/parsers/src/cert_management.rs
+++ b/parsers/src/cert_management.rs
@@ -120,7 +120,7 @@ impl IqSetPayload for Revoke {}
 mod tests {
     use super::*;
     use crate::ns;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/chatstates.rs b/parsers/src/chatstates.rs
index 4f7ff7fc8f2ec9b144abbb39dbc76137b5fb5130..8621317897aeb048c575eac480ce51915e9a718b 100644
--- a/parsers/src/chatstates.rs
+++ b/parsers/src/chatstates.rs
@@ -33,7 +33,7 @@ impl MessagePayload for ChatState {}
 mod tests {
     use super::*;
     use crate::ns;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[test]
diff --git a/parsers/src/component.rs b/parsers/src/component.rs
index 6bee142cc97019d66598b57c2b60b8d09bbcc701..45bb62b4fb7246bc3cbf6aed248cb0978541ca2c 100644
--- a/parsers/src/component.rs
+++ b/parsers/src/component.rs
@@ -43,7 +43,7 @@ impl Handshake {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/csi.rs b/parsers/src/csi.rs
index 56cb76af7656b060c90ef16015c5f9db50b0721e..93b59f1962d93cd7b14fbb3852307a1d3df68b2e 100644
--- a/parsers/src/csi.rs
+++ b/parsers/src/csi.rs
@@ -27,7 +27,7 @@ pub struct Active;
 mod tests {
     use super::*;
     use crate::ns;
-    use crate::Element;
+    use minidom::Element;
 
     #[test]
     fn test_size() {
diff --git a/parsers/src/data_forms.rs b/parsers/src/data_forms.rs
index b7a839af7a2fa6cc8baa5c90dc662bc9a9c2fed9..9bcd666956bf3f10801d1263937dcfc45789c5fe 100644
--- a/parsers/src/data_forms.rs
+++ b/parsers/src/data_forms.rs
@@ -7,7 +7,7 @@
 use crate::data_forms_validate::Validate;
 use crate::media_element::MediaElement;
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 generate_element!(
diff --git a/parsers/src/data_forms_validate.rs b/parsers/src/data_forms_validate.rs
index f9aad49f2aceeed3c4c99537d5117ddc4f2ddf42..2fc18ce9976347dd20b8a059e1f6908d89c2a611 100644
--- a/parsers/src/data_forms_validate.rs
+++ b/parsers/src/data_forms_validate.rs
@@ -8,10 +8,12 @@ use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 
 use minidom::{Element, IntoAttributeValue};
-use xso::{error::FromElementError, AsXml, FromXml};
+use xso::{
+    error::{Error, FromElementError},
+    AsXml, FromXml,
+};
 
 use crate::ns::{self, XDATA_VALIDATE};
-use crate::Error;
 
 /// Validation Method
 #[derive(Debug, Clone, PartialEq)]
diff --git a/parsers/src/delay.rs b/parsers/src/delay.rs
index da946dec76af8d5f546fa4d0a4de3f1b5f913ceb..717115c2d84ea0fd9547acc08c51ef0e34739c49 100644
--- a/parsers/src/delay.rs
+++ b/parsers/src/delay.rs
@@ -35,8 +35,8 @@ impl PresencePayload for Delay {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
     use jid::BareJid;
+    use minidom::Element;
     use std::str::FromStr;
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/disco.rs b/parsers/src/disco.rs
index c9734208c86101a6cc0a5d11921287182ee6eb98..f2eb5f619bfbaa5175c9506fba27f47b0e36a81f 100644
--- a/parsers/src/disco.rs
+++ b/parsers/src/disco.rs
@@ -13,8 +13,8 @@ use crate::data_forms::{DataForm, DataFormType};
 use crate::iq::{IqGetPayload, IqResultPayload};
 use crate::ns;
 use crate::rsm::{SetQuery, SetResult};
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 
 /// Structure representing a `<query xmlns='http://jabber.org/protocol/disco#info'/>` element.
 ///
diff --git a/parsers/src/ecaps2.rs b/parsers/src/ecaps2.rs
index 49c29128b996ce8f45563dd0f8c6797cb039939a..6472e0ff0037d64a8a5d5635d35289f58def50d2 100644
--- a/parsers/src/ecaps2.rs
+++ b/parsers/src/ecaps2.rs
@@ -186,7 +186,7 @@ pub fn query_ecaps2(hash: Hash) -> DiscoInfoQuery {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::FromElementError;
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/eme.rs b/parsers/src/eme.rs
index e9c5319e42abc3d255f7597b2d22a4213c98607c..fafba2b45ba11834919c7d9d17dc4358fa18bb9e 100644
--- a/parsers/src/eme.rs
+++ b/parsers/src/eme.rs
@@ -28,7 +28,7 @@ impl MessagePayload for ExplicitMessageEncryption {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/extdisco.rs b/parsers/src/extdisco.rs
index 48532a491a9caf23e0909181f71c8ed3008a40fe..89991517112cd73e69a6a2c23e48ed0d59604365 100644
--- a/parsers/src/extdisco.rs
+++ b/parsers/src/extdisco.rs
@@ -143,7 +143,7 @@ impl IqResultPayload for Credentials {}
 mod tests {
     use super::*;
     use crate::ns;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/fast.rs b/parsers/src/fast.rs
index a96843f9d29b226c2d41c5878cf9b25eac052d52..75b3b66bca073c184adb063714616cdc99f2582f 100644
--- a/parsers/src/fast.rs
+++ b/parsers/src/fast.rs
@@ -77,7 +77,7 @@ pub struct Token {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
 
     #[test]
diff --git a/parsers/src/forwarding.rs b/parsers/src/forwarding.rs
index 1b07caf6825127ba43f30afae60ba83a82ec261b..5bc1eda976f7cf923b7df86977f2f856d7633130 100644
--- a/parsers/src/forwarding.rs
+++ b/parsers/src/forwarding.rs
@@ -26,7 +26,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/hashes.rs b/parsers/src/hashes.rs
index d4ce6d8a5fd75dd6c4b7a3f0f0167f3a9c9e3e52..dbe3afe3a249e665afc7c8352ae8c4f87f696ef8 100644
--- a/parsers/src/hashes.rs
+++ b/parsers/src/hashes.rs
@@ -244,7 +244,7 @@ impl Deref for Sha1HexAttribute {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::FromElementError;
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/http_upload.rs b/parsers/src/http_upload.rs
index 4856e0585160c8f2028515b6c0b5dc75d086a668..869df4a11c4621f2a7d85266a63b6f1aeb3e1ac5 100644
--- a/parsers/src/http_upload.rs
+++ b/parsers/src/http_upload.rs
@@ -11,7 +11,7 @@ use xso::{
 
 use crate::iq::{IqGetPayload, IqResultPayload};
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 
 /// Requesting a slot
 #[derive(FromXml, AsXml, Debug, Clone, PartialEq)]
diff --git a/parsers/src/ibb.rs b/parsers/src/ibb.rs
index fe5f6dd6b7f23049a14446143f37ff0453edde30..ea74ec23ff9c3ed222e4c7156484e9cb384aab84 100644
--- a/parsers/src/ibb.rs
+++ b/parsers/src/ibb.rs
@@ -76,7 +76,7 @@ impl IqSetPayload for Close {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/ibr.rs b/parsers/src/ibr.rs
index df73f7c06ef5279ad26d2842e3753fb8ec970799..2bd8916bd5ebdcf0da7d05d8f07ee1842e8e14dd 100644
--- a/parsers/src/ibr.rs
+++ b/parsers/src/ibr.rs
@@ -7,7 +7,7 @@
 use crate::data_forms::DataForm;
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use std::collections::HashMap;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/idle.rs b/parsers/src/idle.rs
index dfee8ec3afee1dc5d67d8ff60cd2f58a404a0089..08b14ef84995cbcc09ce69586cd0cecd3575e0bd 100644
--- a/parsers/src/idle.rs
+++ b/parsers/src/idle.rs
@@ -24,7 +24,7 @@ impl PresencePayload for Idle {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/iq.rs b/parsers/src/iq.rs
index cb53f38b045f8871e04becbd955fb3472c1d5f9d..d2d4f272d10f5fe571e368da18a79fc2cace3f88 100644
--- a/parsers/src/iq.rs
+++ b/parsers/src/iq.rs
@@ -7,8 +7,8 @@
 
 use crate::ns;
 use crate::stanza_error::StanzaError;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use minidom::IntoAttributeValue;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/jid_prep.rs b/parsers/src/jid_prep.rs
index 82e1d8bf11c01b465b79af550ce90b76e2447ed3..ef1a334fb158f3d8a1d53bfd7de19fd115da3a7c 100644
--- a/parsers/src/jid_prep.rs
+++ b/parsers/src/jid_prep.rs
@@ -43,8 +43,8 @@ impl IqResultPayload for JidPrepResponse {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
     use jid::FullJid;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle.rs b/parsers/src/jingle.rs
index 1de9f2e540d8be8ddcb1fe810bfc4fff5e58d5c9..944459f761f09da040f79feea805002b0e8adb4b 100644
--- a/parsers/src/jingle.rs
+++ b/parsers/src/jingle.rs
@@ -11,8 +11,8 @@ use crate::jingle_ice_udp::Transport as IceUdpTransport;
 use crate::jingle_rtp::Description as RtpDescription;
 use crate::jingle_s5b::Transport as Socks5Transport;
 use crate::ns;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use std::collections::BTreeMap;
 use std::fmt;
 use std::str::FromStr;
diff --git a/parsers/src/jingle_dtls_srtp.rs b/parsers/src/jingle_dtls_srtp.rs
index 7d28af754b16ac711eeb7341c911480bda88bedf..f1a763e7149e14668ce82a90ec08598230af6c08 100644
--- a/parsers/src/jingle_dtls_srtp.rs
+++ b/parsers/src/jingle_dtls_srtp.rs
@@ -72,7 +72,7 @@ impl Fingerprint {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_grouping.rs b/parsers/src/jingle_grouping.rs
index a01d3f5fbc34a665b90f8a747a5dfc78e885d2bc..ed67092fae8816ea27927842eb6841ef3b1a522c 100644
--- a/parsers/src/jingle_grouping.rs
+++ b/parsers/src/jingle_grouping.rs
@@ -54,7 +54,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_ibb.rs b/parsers/src/jingle_ibb.rs
index c660ca280b6f98e624b0cd523beed47c2e8b0174..ecc5a9046c8573847135f5a4bb5eea80d81c520f 100644
--- a/parsers/src/jingle_ibb.rs
+++ b/parsers/src/jingle_ibb.rs
@@ -24,7 +24,7 @@ attributes: [
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/jingle_ice_udp.rs b/parsers/src/jingle_ice_udp.rs
index 32efac692c4b9df8c91803d08c0704073b6efa28..faf23e4d9bc212a34b419e4d6de07de9a34bfca2 100644
--- a/parsers/src/jingle_ice_udp.rs
+++ b/parsers/src/jingle_ice_udp.rs
@@ -128,7 +128,7 @@ mod tests {
     use super::*;
     use crate::hashes::Algo;
     use crate::jingle_dtls_srtp::Setup;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_message.rs b/parsers/src/jingle_message.rs
index 49afa0a4f27808dcc22d162b85659a4dda6eefdb..fb3c81e3d3b1b2f2ad9036e29729425446908899 100644
--- a/parsers/src/jingle_message.rs
+++ b/parsers/src/jingle_message.rs
@@ -6,7 +6,7 @@
 
 use crate::jingle::SessionId;
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 /// Defines a protocol for broadcasting Jingle requests to all of the clients
diff --git a/parsers/src/jingle_raw_udp.rs b/parsers/src/jingle_raw_udp.rs
index 78e0bc04458cff3ac3d6d0f8a7a1085295420149..152645d4312555872865948df0466e91e54ffd6f 100644
--- a/parsers/src/jingle_raw_udp.rs
+++ b/parsers/src/jingle_raw_udp.rs
@@ -68,7 +68,7 @@ pub struct Candidate {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_rtcp_fb.rs b/parsers/src/jingle_rtcp_fb.rs
index 1ff9f8223ce603e65490892b749d8c7a7cce7c5d..e67c7c4bf9098e8c7e57fd399164074e2e32ccf2 100644
--- a/parsers/src/jingle_rtcp_fb.rs
+++ b/parsers/src/jingle_rtcp_fb.rs
@@ -24,7 +24,7 @@ pub struct RtcpFb {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_rtp.rs b/parsers/src/jingle_rtp.rs
index 0442a16426e85d5e0b2f4caf3254fdaed08bdaf2..03eb3a97b59dd5cc0bea8b596570e5272aeb65ad 100644
--- a/parsers/src/jingle_rtp.rs
+++ b/parsers/src/jingle_rtp.rs
@@ -154,7 +154,7 @@ pub struct Parameter {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_rtp_hdrext.rs b/parsers/src/jingle_rtp_hdrext.rs
index 2f8ba070c6ac930839af0b4dde31162112ccb807..5a0ec107c05b8de2412f33aa2db91296146ae3ee 100644
--- a/parsers/src/jingle_rtp_hdrext.rs
+++ b/parsers/src/jingle_rtp_hdrext.rs
@@ -55,7 +55,7 @@ impl RtpHdrext {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/jingle_s5b.rs b/parsers/src/jingle_s5b.rs
index bf8187eaf5e513ecc1143b88c971dc701c167c25..0b8883a41948a87bf671216e87e25adfcbdbf09c 100644
--- a/parsers/src/jingle_s5b.rs
+++ b/parsers/src/jingle_s5b.rs
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use crate::ns;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use std::net::IpAddr;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/jingle_ssma.rs b/parsers/src/jingle_ssma.rs
index df43f550ff8a57e3f3ebbde978cc656590a79718..2ea691888407afe268e359e13198d05f624d4ab6 100644
--- a/parsers/src/jingle_ssma.rs
+++ b/parsers/src/jingle_ssma.rs
@@ -83,7 +83,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/legacy_omemo.rs b/parsers/src/legacy_omemo.rs
index 2fe46bf3c8681311b33f340da7dcb9890164b4af..8e8d2f2d85999e725aa33ea462e6f48a6f644422 100644
--- a/parsers/src/legacy_omemo.rs
+++ b/parsers/src/legacy_omemo.rs
@@ -184,7 +184,7 @@ impl MessagePayload for Encrypted {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[test]
     fn parse_bundle() {
diff --git a/parsers/src/lib.rs b/parsers/src/lib.rs
index 2c89a9092a62b986091e74a6a1acb12ee00dbcfe..550592e32adddc9ee24df03ed7ea57fcace158ff 100644
--- a/parsers/src/lib.rs
+++ b/parsers/src/lib.rs
@@ -23,16 +23,18 @@
 
 #![warn(missing_docs)]
 
-pub use xso::error::{Error, FromElementError};
-// TODO: only export top-level module on the next major release
-pub use jid::{self, BareJid, Error as JidParseError, FullJid, Jid};
-pub use minidom::Element;
-
 pub use blake2;
+pub use jid;
+pub use minidom;
 pub use sha1;
 pub use sha2;
 pub use sha3;
 
+// We normally only reexport entire crates, but xso is a special case since it uses proc macros
+// which require it to be directly imported as a crate.  The only useful symbol we have to reexport
+// is its error type, which we expose in all of our return types.
+pub use xso::error::Error;
+
 /// XML namespace definitions used through XMPP.
 pub mod ns;
 
diff --git a/parsers/src/mam.rs b/parsers/src/mam.rs
index 403008bf61230b8098fd66f86c78eecee0890755..a4c04838098ae7df8cfde8a0370116f27607be06 100644
--- a/parsers/src/mam.rs
+++ b/parsers/src/mam.rs
@@ -17,7 +17,7 @@ use crate::message::MessagePayload;
 use crate::ns;
 use crate::pubsub::NodeName;
 use crate::rsm::{SetQuery, SetResult};
-use crate::Element;
+use minidom::Element;
 use minidom::Node;
 
 generate_id!(
diff --git a/parsers/src/media_element.rs b/parsers/src/media_element.rs
index 50e88500cfea1d446c8e123a9050fe28ca203f01..99dbc016a037c2ff79cff9229b8c96620be4dae6 100644
--- a/parsers/src/media_element.rs
+++ b/parsers/src/media_element.rs
@@ -46,7 +46,7 @@ generate_element!(
 mod tests {
     use super::*;
     use crate::data_forms::DataForm;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/message.rs b/parsers/src/message.rs
index ac0ff3fb90f331519611fb8cef047b3da2b8a7e8..30222a43516d075029cae1978bbe824e6b0d028d 100644
--- a/parsers/src/message.rs
+++ b/parsers/src/message.rs
@@ -5,8 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use crate::ns;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use std::collections::BTreeMap;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/message_correct.rs b/parsers/src/message_correct.rs
index 1516053ade7832ec25db97ba1f22dda7424bbf3d..9b3c2c94f44f4ac092dbf00c1fcdde3f2e8b22d3 100644
--- a/parsers/src/message_correct.rs
+++ b/parsers/src/message_correct.rs
@@ -24,7 +24,7 @@ impl MessagePayload for Replace {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/mix.rs b/parsers/src/mix.rs
index 87758a60b58afe6fbff24f2883d1c5a4493db504..7835a5dbb7d8e4a392acc6ed746a58843f5aec3b 100644
--- a/parsers/src/mix.rs
+++ b/parsers/src/mix.rs
@@ -254,7 +254,7 @@ impl Destroy {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[test]
     fn participant() {
diff --git a/parsers/src/mood.rs b/parsers/src/mood.rs
index 27263e3a40adaa424dd22b00a0a7e0a1b952641a..9452072a45b32ea382d5d38c6339502f41ec7e3c 100644
--- a/parsers/src/mood.rs
+++ b/parsers/src/mood.rs
@@ -271,7 +271,7 @@ generate_elem_id!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/muc/muc.rs b/parsers/src/muc/muc.rs
index 38fa8a006607bd9c78b2a9c09c01416d5b78a355..ba5b2060fa970b2e51107e337f382b815bd53d7f 100644
--- a/parsers/src/muc/muc.rs
+++ b/parsers/src/muc/muc.rs
@@ -99,7 +99,7 @@ impl Muc {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/muc/user.rs b/parsers/src/muc/user.rs
index 1cc35335459116ec928855e06a60883a08843766..aee3f377e953d9a342d74981d4ae07aa087d3496 100644
--- a/parsers/src/muc/user.rs
+++ b/parsers/src/muc/user.rs
@@ -13,7 +13,7 @@ use xso::{
 use crate::message::MessagePayload;
 use crate::ns;
 use crate::presence::PresencePayload;
-use crate::Element;
+use minidom::Element;
 
 use jid::FullJid;
 
@@ -310,7 +310,7 @@ mod tests {
     use super::*;
     use crate::message::Message;
     use crate::presence::{Presence, Type as PresenceType};
-    use crate::Jid;
+    use jid::Jid;
 
     #[test]
     fn test_simple() {
diff --git a/parsers/src/nick.rs b/parsers/src/nick.rs
index c6c8a5df4bc98ed5fd90a33ba49484c69dcda9d8..9ccfd4e414ea99499480b2b2ce416c878a7540ca 100644
--- a/parsers/src/nick.rs
+++ b/parsers/src/nick.rs
@@ -14,7 +14,7 @@ generate_elem_id!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     #[cfg(not(feature = "disable-validation"))]
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/occupant_id.rs b/parsers/src/occupant_id.rs
index 95d9a844cc412acba79609058e67e87fa8156603..a175f64780cada40bf4afbfcb962fb3790aab364 100644
--- a/parsers/src/occupant_id.rs
+++ b/parsers/src/occupant_id.rs
@@ -28,7 +28,7 @@ impl PresencePayload for OccupantId {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/oob.rs b/parsers/src/oob.rs
index 9c0d0d2279fad03c07e3ed784c53d9c7834bac57..dbcb490cca889e7fbf2678366428c678b593267d 100644
--- a/parsers/src/oob.rs
+++ b/parsers/src/oob.rs
@@ -23,7 +23,7 @@ impl MessagePayload for Oob {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/openpgp.rs b/parsers/src/openpgp.rs
index fecb97e8c18644c082b030ef80859e0f08744661..355e8cfdcef1568ac6d50890e9600e3e5a953ff5 100644
--- a/parsers/src/openpgp.rs
+++ b/parsers/src/openpgp.rs
@@ -67,7 +67,7 @@ mod tests {
         pubsub::{Item as PubSubItem, Publish},
         Item, NodeName,
     };
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
 
     #[test]
diff --git a/parsers/src/ping.rs b/parsers/src/ping.rs
index 2d505cc89690c5b9d942ce52950e2be2438f4177..6b5e4c51f4dab9bb31cb51eef2abad2d04621ade 100644
--- a/parsers/src/ping.rs
+++ b/parsers/src/ping.rs
@@ -21,7 +21,7 @@ impl IqGetPayload for Ping {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     #[cfg(not(feature = "disable-validation"))]
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/pubsub/event.rs b/parsers/src/pubsub/event.rs
index d154150132bb21fa5562d9e05f75156195059ed9..1ab36794ea5793e4ec5fa0f4461524e5d53bb984 100644
--- a/parsers/src/pubsub/event.rs
+++ b/parsers/src/pubsub/event.rs
@@ -9,8 +9,8 @@ use crate::date::DateTime;
 use crate::message::MessagePayload;
 use crate::ns;
 use crate::pubsub::{Item as PubSubItem, ItemId, NodeName, Subscription, SubscriptionId};
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 /// Event wrapper for a PubSub `<item/>`.
diff --git a/parsers/src/pubsub/mod.rs b/parsers/src/pubsub/mod.rs
index fcbb569645542739d094787e1d036c635730e5cf..46d7f355605424b80773b42aa70ce40e39e011e0 100644
--- a/parsers/src/pubsub/mod.rs
+++ b/parsers/src/pubsub/mod.rs
@@ -18,7 +18,8 @@ pub use self::event::PubSubEvent;
 pub use self::owner::PubSubOwner;
 pub use self::pubsub::PubSub;
 
-use crate::{Element, Jid};
+use jid::Jid;
+use minidom::Element;
 
 generate_id!(
     /// The name of a PubSub node, used to identify it on a JID.
@@ -105,4 +106,4 @@ impl Item {
 }
 
 /// This trait should be implemented on any element which can be included as a PubSub payload.
-pub trait PubSubPayload: ::std::convert::TryFrom<crate::Element> + Into<crate::Element> {}
+pub trait PubSubPayload: TryFrom<Element> + Into<Element> {}
diff --git a/parsers/src/pubsub/owner.rs b/parsers/src/pubsub/owner.rs
index 430bae8103f6d059cd116310a0f8fad6bd157e7f..e33027fdd4125a83ca792b4485b684cf4033a399 100644
--- a/parsers/src/pubsub/owner.rs
+++ b/parsers/src/pubsub/owner.rs
@@ -11,8 +11,8 @@ use crate::data_forms::DataForm;
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
 use crate::ns;
 use crate::pubsub::{AffiliationAttribute, NodeName, Subscription};
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 generate_element!(
diff --git a/parsers/src/pubsub/pubsub.rs b/parsers/src/pubsub/pubsub.rs
index b6cc74e60dbbd98d4ed59f9cb76e9256227a854a..db565c64dad6e0b95ed47067a40ebf597695edfb 100644
--- a/parsers/src/pubsub/pubsub.rs
+++ b/parsers/src/pubsub/pubsub.rs
@@ -15,8 +15,8 @@ use crate::ns;
 use crate::pubsub::{
     AffiliationAttribute, Item as PubSubItem, NodeName, Subscription, SubscriptionId,
 };
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 
 // TODO: a better solution would be to split this into a query and a result elements, like for
 // XEP-0030.
diff --git a/parsers/src/reactions.rs b/parsers/src/reactions.rs
index 967b01f61cfb52811a975d8c2d89ac35cefb504f..b79afdda5b6406d358ed7c2e6ace7d79ca9e8689 100644
--- a/parsers/src/reactions.rs
+++ b/parsers/src/reactions.rs
@@ -36,7 +36,7 @@ pub struct Reaction {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/receipts.rs b/parsers/src/receipts.rs
index 1e3fc22582408891d2af199b0a713c353af6ea43..eeb19e30d360aa50b522533f87f7183a0417eed7 100644
--- a/parsers/src/receipts.rs
+++ b/parsers/src/receipts.rs
@@ -33,7 +33,7 @@ impl MessagePayload for Received {}
 mod tests {
     use super::*;
     use crate::ns;
-    use crate::Element;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/roster.rs b/parsers/src/roster.rs
index fe6e8b3bdbde9152dab0f7f4ec36a33a6f0582c7..7ce3ad560ed832abf3dac0e2c3bbe1fe9d0c1727 100644
--- a/parsers/src/roster.rs
+++ b/parsers/src/roster.rs
@@ -91,7 +91,7 @@ impl IqResultPayload for Roster {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
     use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/rsm.rs b/parsers/src/rsm.rs
index 7ffc6f2d3861abf83c2ba7ad51401bfd8c825554..69c885afc9736c82cc33d53fcf74d9313ef6c73d 100644
--- a/parsers/src/rsm.rs
+++ b/parsers/src/rsm.rs
@@ -5,7 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 /// Requests paging through a potentially big set of items (represented by an
diff --git a/parsers/src/rtt.rs b/parsers/src/rtt.rs
index a80329123ed101f7cbb70d9116f5e24c8dcd9c66..b8512d994ed8416c26b49f0e9d0d587fa82a22b1 100644
--- a/parsers/src/rtt.rs
+++ b/parsers/src/rtt.rs
@@ -7,7 +7,7 @@
 use xso::{text::EmptyAsNone, AsXml, FromXml};
 
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 generate_attribute!(
diff --git a/parsers/src/sasl.rs b/parsers/src/sasl.rs
index 59f20b5e9a9a0ab9c0f01f01d7cd62a734e94638..cd46fd349917ad63fe3839be0f4fdc0dca3be2b1 100644
--- a/parsers/src/sasl.rs
+++ b/parsers/src/sasl.rs
@@ -11,7 +11,7 @@ use xso::{
 };
 
 use crate::ns;
-use crate::Element;
+use minidom::Element;
 use std::collections::BTreeMap;
 
 generate_attribute!(
diff --git a/parsers/src/sm.rs b/parsers/src/sm.rs
index c62bb66a4ccab432e29abec76f76f00980efc35c..3142d5fc19ec9f152da9909e7ba9b880224a0d8d 100644
--- a/parsers/src/sm.rs
+++ b/parsers/src/sm.rs
@@ -146,7 +146,7 @@ pub struct StreamManagement;
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/stanza_error.rs b/parsers/src/stanza_error.rs
index ab3b1c02fc219ddeeef04e395a399a0eb75dfbaa..52e51a87989531027bcc8523da67b9ad8fbebade 100644
--- a/parsers/src/stanza_error.rs
+++ b/parsers/src/stanza_error.rs
@@ -7,8 +7,8 @@
 use crate::message::MessagePayload;
 use crate::ns;
 use crate::presence::PresencePayload;
-use crate::Element;
 use jid::Jid;
+use minidom::Element;
 use minidom::Node;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
diff --git a/parsers/src/stanza_id.rs b/parsers/src/stanza_id.rs
index f9f346227a651b735b995826dea192256ff63c9b..04575d3d90c6d17bc20777f446baaa090087cbeb 100644
--- a/parsers/src/stanza_id.rs
+++ b/parsers/src/stanza_id.rs
@@ -41,8 +41,8 @@ impl MessagePayload for OriginId {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
     use jid::BareJid;
+    use minidom::Element;
     use xso::error::{Error, FromElementError};
 
     #[cfg(target_pointer_width = "32")]
diff --git a/parsers/src/stream.rs b/parsers/src/stream.rs
index 594ce4d6144f5f104560d9ec28770bcd15272b6b..0e8f929237c5f2284201f5a4084433eafb9d91df 100644
--- a/parsers/src/stream.rs
+++ b/parsers/src/stream.rs
@@ -81,7 +81,7 @@ impl Stream {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/time.rs b/parsers/src/time.rs
index 86a31949a70f35365a5ac73e7850eb5d3f1a2a03..c01206fc762a7622b46bef862a7e5b7702f84e3d 100644
--- a/parsers/src/time.rs
+++ b/parsers/src/time.rs
@@ -9,8 +9,8 @@ use xso::{AsXml, FromXml};
 use crate::date::DateTime;
 use crate::iq::{IqGetPayload, IqResultPayload};
 use crate::ns;
-use crate::Element;
 use chrono::FixedOffset;
+use minidom::Element;
 use std::str::FromStr;
 use xso::error::{Error, FromElementError};
 
diff --git a/parsers/src/tune.rs b/parsers/src/tune.rs
index 5c91051e06f14fce8359a70b67babd4f39af83b0..90c87b418a13cfd08bee9078757cea3320afb10b 100644
--- a/parsers/src/tune.rs
+++ b/parsers/src/tune.rs
@@ -6,7 +6,7 @@
 
 use crate::ns;
 use crate::pubsub::PubSubPayload;
-use crate::Element;
+use minidom::Element;
 use xso::error::{Error, FromElementError};
 
 generate_elem_id!(
diff --git a/parsers/src/util/macros.rs b/parsers/src/util/macros.rs
index 54503e2777409f87c5f20d9dd67318761999a861..5a084ba1359356875ca2de982e8258784f80053d 100644
--- a/parsers/src/util/macros.rs
+++ b/parsers/src/util/macros.rs
@@ -288,9 +288,9 @@ macro_rules! generate_element_enum {
                 $enum
             ),+
         }
-        impl ::std::convert::TryFrom<crate::Element> for $elem {
+        impl ::std::convert::TryFrom<minidom::Element> for $elem {
             type Error = xso::error::FromElementError;
-            fn try_from(elem: crate::Element) -> Result<$elem, xso::error::FromElementError> {
+            fn try_from(elem: minidom::Element) -> Result<$elem, xso::error::FromElementError> {
                 check_ns_only!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_attributes!(elem, $name);
@@ -300,9 +300,9 @@ macro_rules! generate_element_enum {
                 })
             }
         }
-        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> crate::Element {
-                crate::Element::builder(
+        impl From<$elem> for minidom::Element {
+            fn from(elem: $elem) -> minidom::Element {
+                minidom::Element::builder(
                     match elem {
                         $($elem::$enum => $enum_name,)+
                     },
@@ -324,9 +324,9 @@ macro_rules! generate_attribute_enum {
                 $enum
             ),+
         }
-        impl ::std::convert::TryFrom<crate::Element> for $elem {
+        impl ::std::convert::TryFrom<minidom::Element> for $elem {
             type Error = xso::error::FromElementError;
-            fn try_from(elem: crate::Element) -> Result<$elem, xso::error::FromElementError> {
+            fn try_from(elem: minidom::Element) -> Result<$elem, xso::error::FromElementError> {
                 check_ns_only!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_unknown_attributes!(elem, $name, [$attr]);
@@ -336,9 +336,9 @@ macro_rules! generate_attribute_enum {
                 })
             }
         }
-        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> crate::Element {
-                crate::Element::builder($name, crate::ns::$ns)
+        impl From<$elem> for minidom::Element {
+            fn from(elem: $elem) -> minidom::Element {
+                minidom::Element::builder($name, crate::ns::$ns)
                     .attr($attr, match elem {
                          $($elem::$enum => $enum_name,)+
                      })
@@ -467,9 +467,9 @@ macro_rules! generate_elem_id {
         $(#[$meta])*
         #[derive(Debug, Clone, PartialEq, Eq, Hash)]
         pub struct $elem(pub $type);
-        impl ::std::convert::TryFrom<crate::Element> for $elem {
+        impl ::std::convert::TryFrom<minidom::Element> for $elem {
             type Error = xso::error::FromElementError;
-            fn try_from(elem: crate::Element) -> Result<$elem, xso::error::FromElementError> {
+            fn try_from(elem: minidom::Element) -> Result<$elem, xso::error::FromElementError> {
                 check_self!(elem, $name, $ns);
                 check_no_children!(elem, $name);
                 check_no_attributes!(elem, $name);
@@ -477,9 +477,9 @@ macro_rules! generate_elem_id {
                 Ok($elem(elem.text().parse().map_err(xso::error::Error::text_parse_error)?))
             }
         }
-        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> crate::Element {
-                crate::Element::builder($name, crate::ns::$ns)
+        impl From<$elem> for minidom::Element {
+            fn from(elem: $elem) -> minidom::Element {
+                minidom::Element::builder($name, crate::ns::$ns)
                     .append(elem.0.to_string())
                     .build()
             }
@@ -637,27 +637,27 @@ macro_rules! finish_parse_elem {
 macro_rules! generate_serialiser {
     ($builder:ident, $parent:ident, $elem:ident, Required, String, ($name:tt, $ns:ident)) => {
         $builder.append(
-            crate::Element::builder($name, crate::ns::$ns)
+            minidom::Element::builder($name, crate::ns::$ns)
                 .append(::minidom::Node::Text($parent.$elem)),
         )
     };
     ($builder:ident, $parent:ident, $elem:ident, Option, String, ($name:tt, $ns:ident)) => {
         $builder.append_all($parent.$elem.map(|elem| {
-            crate::Element::builder($name, crate::ns::$ns).append(::minidom::Node::Text(elem))
+            minidom::Element::builder($name, crate::ns::$ns).append(::minidom::Node::Text(elem))
         }))
     };
     ($builder:ident, $parent:ident, $elem:ident, Option, $constructor:ident, ($name:tt, *)) => {
         $builder.append_all(
             $parent
                 .$elem
-                .map(|elem| ::minidom::Node::Element(crate::Element::from(elem))),
+                .map(|elem| ::minidom::Node::Element(minidom::Element::from(elem))),
         )
     };
     ($builder:ident, $parent:ident, $elem:ident, Option, $constructor:ident, ($name:tt, $ns:ident)) => {
         $builder.append_all(
             $parent
                 .$elem
-                .map(|elem| ::minidom::Node::Element(crate::Element::from(elem))),
+                .map(|elem| ::minidom::Node::Element(minidom::Element::from(elem))),
         )
     };
     ($builder:ident, $parent:ident, $elem:ident, Vec, $constructor:ident, ($name:tt, $ns:ident)) => {
@@ -667,11 +667,11 @@ macro_rules! generate_serialiser {
         $builder.append_all(
             $parent
                 .$elem
-                .then(|| crate::Element::builder($name, crate::ns::$ns)),
+                .then(|| minidom::Element::builder($name, crate::ns::$ns)),
         )
     };
     ($builder:ident, $parent:ident, $elem:ident, $_:ident, $constructor:ident, ($name:tt, $ns:ident)) => {
-        $builder.append(::minidom::Node::Element(crate::Element::from(
+        $builder.append(::minidom::Node::Element(minidom::Element::from(
             $parent.$elem,
         )))
     };
@@ -734,10 +734,10 @@ macro_rules! generate_element {
             }
         }
 
-        impl ::std::convert::TryFrom<crate::Element> for $elem {
+        impl ::std::convert::TryFrom<minidom::Element> for $elem {
             type Error = xso::error::FromElementError;
 
-            fn try_from(mut elem: crate::Element) -> Result<$elem, xso::error::FromElementError> {
+            fn try_from(mut elem: minidom::Element) -> Result<$elem, xso::error::FromElementError> {
                 check_self!(elem, $name, $ns);
                 check_no_unknown_attributes!(elem, $name, [$($attr_name),*]);
                 $(
@@ -790,9 +790,9 @@ macro_rules! generate_element {
             }
         }
 
-        impl From<$elem> for crate::Element {
-            fn from(elem: $elem) -> crate::Element {
-                let mut builder = crate::Element::builder($name, crate::ns::$ns);
+        impl From<$elem> for minidom::Element {
+            fn from(elem: $elem) -> minidom::Element {
+                let mut builder = minidom::Element::builder($name, crate::ns::$ns);
                 $(
                     builder = builder.attr($attr_name, elem.$attr);
                 )*
@@ -827,10 +827,10 @@ macro_rules! assert_size (
 // TODO: move that to src/pubsub/mod.rs, once we figure out how to use macros from there.
 macro_rules! impl_pubsub_item {
     ($item:ident, $ns:ident) => {
-        impl ::std::convert::TryFrom<crate::Element> for $item {
+        impl ::std::convert::TryFrom<minidom::Element> for $item {
             type Error = FromElementError;
 
-            fn try_from(mut elem: crate::Element) -> Result<$item, FromElementError> {
+            fn try_from(mut elem: minidom::Element) -> Result<$item, FromElementError> {
                 check_self!(elem, "item", $ns);
                 check_no_unknown_attributes!(elem, "item", ["id", "publisher"]);
                 let mut payloads = elem.take_contents_as_children().collect::<Vec<_>>();
@@ -846,9 +846,9 @@ macro_rules! impl_pubsub_item {
             }
         }
 
-        impl From<$item> for crate::Element {
-            fn from(item: $item) -> crate::Element {
-                crate::Element::builder("item", ns::$ns)
+        impl From<$item> for minidom::Element {
+            fn from(item: $item) -> minidom::Element {
+                minidom::Element::builder("item", ns::$ns)
                     .attr("id", item.0.id)
                     .attr("publisher", item.0.publisher)
                     .append_all(item.0.payload)
diff --git a/parsers/src/vcard.rs b/parsers/src/vcard.rs
index 2a2ea6db5aabef07a0c157e6efc9d9cb5e51171d..72d8640a8ebb21acb41d661d9f596a1c7d8d596f 100644
--- a/parsers/src/vcard.rs
+++ b/parsers/src/vcard.rs
@@ -13,11 +13,11 @@
 //! For vCard updates defined in [XEP-0153](https://xmpp.org/extensions/xep-0153.html),
 //! see [`vcard_update`][crate::vcard_update] module.
 
-use xso::{AsXml, FromXml};
+use xso::{error::Error, AsXml, FromXml};
 
 use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
+use crate::ns;
 use crate::util::text_node_codecs::{Codec, WhitespaceAwareBase64};
-use crate::{ns, Error};
 use minidom::Element;
 
 generate_element!(
diff --git a/parsers/src/vcard_update.rs b/parsers/src/vcard_update.rs
index c4d942af54c8e13fb44f35363ce17baaeee7ddc2..052ce9e1442720f70ef1447ec88378be5a12941e 100644
--- a/parsers/src/vcard_update.rs
+++ b/parsers/src/vcard_update.rs
@@ -35,7 +35,7 @@ generate_element!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
     use std::str::FromStr;
 
     #[test]
diff --git a/parsers/src/version.rs b/parsers/src/version.rs
index cf51f5fcba27ebc7514fdddd78c8ddea67ec5969..3a903a88746eb2d39d0b73aba45d6a966484bdc7 100644
--- a/parsers/src/version.rs
+++ b/parsers/src/version.rs
@@ -42,7 +42,7 @@ impl IqResultPayload for VersionResult {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]
diff --git a/parsers/src/websocket.rs b/parsers/src/websocket.rs
index ebf829f73af8e7750d8e9b608fa0f6f0e45d0044..6281da8459b58cf02b608ef92a41ae34ecd8b683 100644
--- a/parsers/src/websocket.rs
+++ b/parsers/src/websocket.rs
@@ -80,7 +80,7 @@ impl Open {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Element;
+    use minidom::Element;
 
     #[cfg(target_pointer_width = "32")]
     #[test]