diff --git a/veilid-cli/src/client_api_connection.rs b/veilid-cli/src/client_api_connection.rs
index 9715a450..0c8980aa 100644
--- a/veilid-cli/src/client_api_connection.rs
+++ b/veilid-cli/src/client_api_connection.rs
@@ -8,7 +8,7 @@ use serde::de::DeserializeOwned;
 use std::cell::RefCell;
 use std::net::SocketAddr;
 use std::rc::Rc;
-use veilid_core::xx::*;
+use veilid_core::tools::*;
 use veilid_core::*;
 
 macro_rules! capnp_failed {
diff --git a/veilid-cli/src/command_processor.rs b/veilid-cli/src/command_processor.rs
index 88674eeb..f015db78 100644
--- a/veilid-cli/src/command_processor.rs
+++ b/veilid-cli/src/command_processor.rs
@@ -6,7 +6,7 @@ use std::cell::*;
 use std::net::SocketAddr;
 use std::rc::Rc;
 use std::time::{Duration, SystemTime};
-use veilid_core::xx::*;
+use veilid_core::tools::*;
 use veilid_core::*;
 
 pub fn convert_loglevel(s: &str) -> Result<VeilidConfigLogLevel, String> {
diff --git a/veilid-cli/src/main.rs b/veilid-cli/src/main.rs
index 0ecd7b37..389db983 100644
--- a/veilid-cli/src/main.rs
+++ b/veilid-cli/src/main.rs
@@ -1,7 +1,7 @@
 #![deny(clippy::all)]
 #![deny(unused_must_use)]
 
-use veilid_core::xx::*;
+use veilid_core::tools::*;
 
 use clap::{Arg, ColorChoice, Command};
 use flexi_logger::*;
diff --git a/veilid-server/src/server.rs b/veilid-server/src/server.rs
index ca936a30..45385203 100644
--- a/veilid-server/src/server.rs
+++ b/veilid-server/src/server.rs
@@ -11,7 +11,7 @@ use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tracing::*;
-use veilid_core::xx::SingleShotEventual;
+use veilid_core::tools::SingleShotEventual;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum ServerMode {
diff --git a/veilid-server/src/settings.rs b/veilid-server/src/settings.rs
index 1636acc0..9a6e6259 100644
--- a/veilid-server/src/settings.rs
+++ b/veilid-server/src/settings.rs
@@ -1,16 +1,13 @@
 #![allow(clippy::bool_assert_comparison)]
 
 use directories::*;
-use parking_lot::*;
 
 use serde_derive::*;
 use std::ffi::OsStr;
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::sync::Arc;
 use url::Url;
-use veilid_core::xx::*;
+use veilid_core::tools::*;
 use veilid_core::*;
 
 pub fn load_default_config() -> EyreResult<config::Config> {
diff --git a/veilid-wasm/src/lib.rs b/veilid-wasm/src/lib.rs
index 3fd7e891..34fec05b 100644
--- a/veilid-wasm/src/lib.rs
+++ b/veilid-wasm/src/lib.rs
@@ -19,7 +19,7 @@ use tracing::*;
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::*;
 use tracing_wasm::{WASMLayerConfigBuilder, *};
-use veilid_core::xx::*;
+use veilid_core::tools::*;
 use veilid_core::*;
 use wasm_bindgen_futures::*;