diff --git a/crates/engine/src/cmd/overkill.rs b/crates/engine/src/cmd/overkill.rs
index 92fc2ab7e..abfdff2eb 100644
--- a/crates/engine/src/cmd/overkill.rs
+++ b/crates/engine/src/cmd/overkill.rs
@@ -13,7 +13,8 @@ use cadcraft_geom::{TAU, Vec2, Vec3, ccw_sweep, norm_angle};
 use serde_json::{Value, json};
 
 use super::machines::{SelOutcome, SelectPhase, number};
-use super::*;
+use super::{CommandSpec, bad, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
diff --git a/crates/engine/src/cmd/plotters.rs b/crates/engine/src/cmd/plotters.rs
index a3e1b59f1..370f03518 100644
--- a/crates/engine/src/cmd/plotters.rs
+++ b/crates/engine/src/cmd/plotters.rs
@@ -14,7 +14,8 @@ use cadcraft_doc::{DevicePaper, Orientation, PageSetup, PlotOutput, PlotterConfi
 use cadcraft_geom::{Bounds2, Vec2};
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, Result, always, bad, has_doc, point_req, str_param};
+
 use crate::{Accept, EngineError, Input, Interactive, Prompt, Session, Step};
 
 /// Where plotter configuration files live. Names are file names ending in
diff --git a/crates/engine/src/cmd/props.rs b/crates/engine/src/cmd/props.rs
index 0150c3390..f9fbf2969 100644
--- a/crates/engine/src/cmd/props.rs
+++ b/crates/engine/src/cmd/props.rs
@@ -10,7 +10,8 @@ use cadcraft_doc::{EntityKind, Lineweight, Transparency};
 use cadcraft_geom::Vec3;
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, always, bad, bool_or, f64_req, find_command, ok, point_req, point_value, str_param, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -1177,10 +1178,9 @@ fn run_rename(s: &mut Session, p: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use serde_json::json;
 
-    use crate::Session;
-
     #[test]
     fn properties_set_rejects_unloaded_linetype() {
         let mut s = Session::new();
diff --git a/crates/engine/src/cmd/props/linfile.rs b/crates/engine/src/cmd/props/linfile.rs
index 2290051c3..b8fd023f2 100644
--- a/crates/engine/src/cmd/props/linfile.rs
+++ b/crates/engine/src/cmd/props/linfile.rs
@@ -7,7 +7,8 @@ use serde_json::{Value, json};
 
 use super::super::helpers::support_text;
 use super::super::qselect::wildcard;
-use super::*;
+use super::{Result, Session, bad, bool_or, str_param};
+
 use crate::{Accept, Input, Interactive, Prompt, Step};
 
 /// Names no file may define: they are not linetype definitions.
diff --git a/crates/engine/src/cmd/props/matchprop.rs b/crates/engine/src/cmd/props/matchprop.rs
index a53f6a5ef..31f4e4951 100644
--- a/crates/engine/src/cmd/props/matchprop.rs
+++ b/crates/engine/src/cmd/props/matchprop.rs
@@ -6,7 +6,8 @@
 use cadcraft_doc::{Entity, EntityKind, Handle};
 use serde_json::{Value, json};
 
-use super::super::*;
+use super::super::{bad, targets};
+
 use crate::{Accept, Input, Interactive, Prompt, Result, Session, Step};
 
 /// Which properties MATCHPROP copies (its Settings).
diff --git a/crates/engine/src/cmd/qselect.rs b/crates/engine/src/cmd/qselect.rs
index 808952e7a..2c5330371 100644
--- a/crates/engine/src/cmd/qselect.rs
+++ b/crates/engine/src/cmd/qselect.rs
@@ -5,7 +5,8 @@ use cadcraft_color::Color;
 use cadcraft_doc::{Drawing, Entity, Handle};
 use serde_json::{Value, json};
 
-use super::*;
+use super::{CommandSpec, bad, str_param};
+
 use crate::{Result, Session};
 
 pub fn specs() -> Vec<CommandSpec> {
@@ -320,9 +321,8 @@ fn run_info(s: &mut Session, p: &Value) -> Result<Value> {
 
 #[cfg(test)]
 mod tests {
-    use serde_json::json;
-
     use super::*;
+    use serde_json::json;
 
     fn session() -> Session {
         let mut s = Session::new();