diff --git a/crates/engine/src/cmd/file/compare.rs b/crates/engine/src/cmd/file/compare.rs
index 15fb17ec1..6bd67acb6 100644
--- a/crates/engine/src/cmd/file/compare.rs
+++ b/crates/engine/src/cmd/file/compare.rs
@@ -12,7 +12,8 @@ use cadcraft_doc::{Drawing, Entity, EntityKind, Handle, MAX_BLOCK_DEPTH, Space,
 use cadcraft_geom::{Bounds2, Vec2};
 use serde_json::{Value, json};
 
-use super::super::*;
+use super::super::{CommandSpec, bad, str_param};
+
 use super::{base64_decode, io};
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
diff --git a/crates/engine/src/cmd/file/pgp.rs b/crates/engine/src/cmd/file/pgp.rs
index e502ad80a..5c358e915 100644
--- a/crates/engine/src/cmd/file/pgp.rs
+++ b/crates/engine/src/cmd/file/pgp.rs
@@ -13,7 +13,7 @@ use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError};
 use serde_json::{Value, json};
 
 use super::super::helpers::support_text;
-use super::*;
+use super::{CommandSpec, Result, Session, bad, bool_or, find_command};
 
 /// Most user aliases held.
 pub const MAX_ALIASES: usize = 10_000;
diff --git a/crates/engine/src/cmd/file/template.rs b/crates/engine/src/cmd/file/template.rs
index f5b29e450..49ce172d0 100644
--- a/crates/engine/src/cmd/file/template.rs
+++ b/crates/engine/src/cmd/file/template.rs
@@ -10,7 +10,7 @@ use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError};
 use cadcraft_doc::Drawing;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{Result, Session, bad, io};
 
 /// The default template (profile setting, process-wide like FONTALT): empty = none.
 fn default_template() -> MutexGuard<'static, String> {
diff --git a/crates/engine/src/cmd/gripcmds.rs b/crates/engine/src/cmd/gripcmds.rs
index cf637d9c8..e2d3cfb87 100644
--- a/crates/engine/src/cmd/gripcmds.rs
+++ b/crates/engine/src/cmd/gripcmds.rs
@@ -5,7 +5,8 @@ use cadcraft_geom::{Mat3, Vec2};
 use serde_json::{Value, json};
 
 use super::curves;
-use super::*;
+use super::{CommandSpec, bad, bool_or, point_param, point_req, targets};
+
 use crate::grips::{GripAction, GripMode, grip_action, mode_matrix, stretch_grip};
 use crate::{EngineError, Result, Session};
 
diff --git a/crates/engine/src/cmd/groups.rs b/crates/engine/src/cmd/groups.rs
index 42addaef6..85b859f90 100644
--- a/crates/engine/src/cmd/groups.rs
+++ b/crates/engine/src/cmd/groups.rs
@@ -11,7 +11,8 @@ use cadcraft_doc::{Drawing, Group, Handle};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase};
-use super::*;
+use super::{CommandSpec, bad, bool_or, str_param, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 mod dash;
diff --git a/crates/engine/src/cmd/groups/dash.rs b/crates/engine/src/cmd/groups/dash.rs
index 902121e33..b131f7ff6 100644
--- a/crates/engine/src/cmd/groups/dash.rs
+++ b/crates/engine/src/cmd/groups/dash.rs
@@ -7,7 +7,8 @@ use serde_json::{Value, json};
 
 use super::super::machines::{SelOutcome, SelectPhase, number};
 use super::super::qselect::wildcard;
-use super::super::*;
+use super::super::{CommandSpec, bad, bool_or, str_param, targets};
+
 use super::{add_members, create, echo_list, find, remove_members, rename, ungroup, valid_name};
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};