diff --git a/examples/digital_locker.rs b/examples/digital_locker.rs
index cfb3730..571856c 100644
--- a/examples/digital_locker.rs
+++ b/examples/digital_locker.rs
@@ -30,8 +30,8 @@ use std::process::exit;
 
 use chacha20poly1305::aead::{Aead, KeyInit};
 use chacha20poly1305::{ChaCha20Poly1305, Key, Nonce};
-use generic_array::GenericArray;
 use opaque_ke::ciphersuite::CipherSuite;
+use opaque_ke::generic_array::GenericArray;
 use opaque_ke::rand::RngCore;
 use opaque_ke::rand::rngs::OsRng;
 use opaque_ke::{
diff --git a/examples/simple_login.rs b/examples/simple_login.rs
index d08fdc6..7affe74 100644
--- a/examples/simple_login.rs
+++ b/examples/simple_login.rs
@@ -25,9 +25,9 @@
 use std::collections::HashMap;
 use std::process::exit;
 
-use argon2::Argon2;
-use generic_array::GenericArray;
+use opaque_ke::argon2::Argon2;
 use opaque_ke::ciphersuite::CipherSuite;
+use opaque_ke::generic_array::GenericArray;
 use opaque_ke::rand::rngs::OsRng;
 use opaque_ke::{
     ClientLogin, ClientLoginFinishParameters, ClientRegistration,
diff --git a/src/lib.rs b/src/lib.rs
index bd31540..5641a76 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1345,7 +1345,9 @@ mod tests;
 
 // Exports
 
-pub use rand;
+#[cfg(feature = "argon2")]
+pub use argon2;
+pub use {generic_array, rand};
 
 pub use crate::ciphersuite::CipherSuite;
 #[cfg(feature = "curve25519")]