diff --git a/src/config.rs b/src/config.rs
index 31a2ee5..7ee4514 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -12,6 +12,7 @@ use rand::{Rng, thread_rng};
 use ring::{aead, pbkdf2};
 use serde_derive::{Deserialize, Serialize};
 use thiserror::Error;
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 
 use grin_onion::crypto::dalek::DalekPublicKey;
 use grin_onion::crypto::secp::SecretKey;
diff --git a/src/mix_client.rs b/src/mix_client.rs
index 7f39f4f..ccfc329 100644
--- a/src/mix_client.rs
+++ b/src/mix_client.rs
@@ -10,6 +10,7 @@ use serde_json::json;
 use thiserror::Error;
 use tor_rtcompat::Runtime;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekPublicKey};
 use grin_onion::onion::Onion;
 
diff --git a/src/node.rs b/src/node.rs
index 677842b..987aa42 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -12,6 +12,7 @@ use grin_util::ToHex;
 use serde_json::json;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp::Commitment;
 
 use crate::http;
diff --git a/src/servers/mix.rs b/src/servers/mix.rs
index 914f283..b9d8184 100644
--- a/src/servers/mix.rs
+++ b/src/servers/mix.rs
@@ -10,6 +10,7 @@ use grin_core::ser::ProtocolVersion;
 use itertools::Itertools;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekSignature};
 use grin_onion::onion::{Onion, OnionError, PeeledOnion};
 use secp256k1zkp::key::ZERO_KEY;
diff --git a/src/servers/mix_rpc.rs b/src/servers/mix_rpc.rs
index f485d1f..c2f7c09 100644
--- a/src/servers/mix_rpc.rs
+++ b/src/servers/mix_rpc.rs
@@ -6,6 +6,7 @@ use jsonrpc_http_server::{DomainsValidation, ServerBuilder};
 use jsonrpc_http_server::jsonrpc_core::{self, BoxFuture, IoHandler};
 use serde::{Deserialize, Serialize};
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::dalek::{self, DalekSignature};
 use grin_onion::onion::Onion;
 
diff --git a/src/servers/swap.rs b/src/servers/swap.rs
index 2b5e0e4..af7f211 100644
--- a/src/servers/swap.rs
+++ b/src/servers/swap.rs
@@ -9,6 +9,7 @@ use itertools::Itertools;
 use secp256k1zkp::key::ZERO_KEY;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::comsig::ComSignature;
 use grin_onion::crypto::secp::{Commitment, Secp256k1, SecretKey};
 use grin_onion::onion::{Onion, OnionError};
diff --git a/src/servers/swap_rpc.rs b/src/servers/swap_rpc.rs
index 4b81183..2c91b7b 100644
--- a/src/servers/swap_rpc.rs
+++ b/src/servers/swap_rpc.rs
@@ -6,6 +6,7 @@ use jsonrpc_derive::rpc;
 use jsonrpc_http_server::{DomainsValidation, ServerBuilder};
 use serde::{Deserialize, Serialize};
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::comsig::{self, ComSignature};
 use grin_onion::onion::Onion;
 
diff --git a/src/store.rs b/src/store.rs
index dd7a19e..2bbaf12 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -7,6 +7,7 @@ use grin_store::{self as store, Store};
 use grin_util::ToHex;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp::{self, Commitment, RangeProof, SecretKey};
 use grin_onion::onion::Onion;
 use grin_onion::util::{read_optional, write_optional};
diff --git a/src/tx.rs b/src/tx.rs
index 4e11a5f..ee53ce0 100644
--- a/src/tx.rs
+++ b/src/tx.rs
@@ -4,6 +4,7 @@ use grin_core::core::{
 	FeeFields, Input, Inputs, KernelFeatures, Output, Transaction, TransactionBody, TxKernel,
 };
 use grin_keychain::BlindingFactor;
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp;
 use secp256k1zkp::{ContextFlag, Secp256k1, SecretKey};
 use serde::{Deserialize, Serialize};
diff --git a/src/wallet.rs b/src/wallet.rs
index 6d65781..68868bc 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use thiserror::Error;
 
+use grin_wallet_libwallet::mwixnet::onion as grin_onion;
 use grin_onion::crypto::secp;
 use secp256k1zkp::{PublicKey, Secp256k1, SecretKey};