diff --git a/nexus/src/app/background/tasks/abandoned_vmm_reaper.rs b/nexus/src/app/background/tasks/abandoned_vmm_reaper.rs
index 3883185d9f..9f185004f3 100644
--- a/nexus/src/app/background/tasks/abandoned_vmm_reaper.rs
+++ b/nexus/src/app/background/tasks/abandoned_vmm_reaper.rs
@@ -31,7 +31,7 @@
 //! is handled elsewhere, by `notify_instance_updated` and (eventually) the
 //! `instance-update` saga.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use anyhow::Context;
 use futures::future::BoxFuture;
 use futures::FutureExt;
diff --git a/nexus/src/app/background/tasks/bfd.rs b/nexus/src/app/background/tasks/bfd.rs
index 2c8f5de216..601ef4a5a6 100644
--- a/nexus/src/app/background/tasks/bfd.rs
+++ b/nexus/src/app/background/tasks/bfd.rs
@@ -9,7 +9,7 @@ use crate::app::{
     background::tasks::networking::build_mgd_clients, map_switch_zone_addrs,
 };
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use internal_dns::{resolver::Resolver, ServiceName};
diff --git a/nexus/src/app/background/tasks/blueprint_execution.rs b/nexus/src/app/background/tasks/blueprint_execution.rs
index b01d1213de..2fc1779504 100644
--- a/nexus/src/app/background/tasks/blueprint_execution.rs
+++ b/nexus/src/app/background/tasks/blueprint_execution.rs
@@ -4,7 +4,7 @@
 
 //! Background task for realizing a plan blueprint
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use nexus_db_queries::context::OpContext;
diff --git a/nexus/src/app/background/tasks/blueprint_load.rs b/nexus/src/app/background/tasks/blueprint_load.rs
index baf86d655f..c43207e281 100644
--- a/nexus/src/app/background/tasks/blueprint_load.rs
+++ b/nexus/src/app/background/tasks/blueprint_load.rs
@@ -7,7 +7,7 @@
 //! This task triggers the `blueprint_execution` background task when the
 //! blueprint changes.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use nexus_db_queries::context::OpContext;
diff --git a/nexus/src/app/background/tasks/crdb_node_id_collector.rs b/nexus/src/app/background/tasks/crdb_node_id_collector.rs
index 2736514021..da4e3448dd 100644
--- a/nexus/src/app/background/tasks/crdb_node_id_collector.rs
+++ b/nexus/src/app/background/tasks/crdb_node_id_collector.rs
@@ -23,7 +23,7 @@
 //! the status of all nodes and looking for orphans, perhaps) to determine
 //! whether a zone without a known node ID ever existed.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use anyhow::ensure;
 use anyhow::Context;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/dns_config.rs b/nexus/src/app/background/tasks/dns_config.rs
index c717d8cf05..55bc88761c 100644
--- a/nexus/src/app/background/tasks/dns_config.rs
+++ b/nexus/src/app/background/tasks/dns_config.rs
@@ -4,7 +4,7 @@
 
 //! Background task for keeping track of DNS configuration
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use dns_service_client::types::DnsConfigParams;
 use futures::future::BoxFuture;
 use futures::FutureExt;
diff --git a/nexus/src/app/background/tasks/dns_propagation.rs b/nexus/src/app/background/tasks/dns_propagation.rs
index 4349453148..7ce321d7f5 100644
--- a/nexus/src/app/background/tasks/dns_propagation.rs
+++ b/nexus/src/app/background/tasks/dns_propagation.rs
@@ -4,8 +4,8 @@
 
 //! Background task for propagating DNS configuration to all DNS servers
 
-use super::common::BackgroundTask;
 use super::dns_servers::DnsServersList;
+use crate::app::background::common::BackgroundTask;
 use anyhow::Context;
 use dns_service_client::types::DnsConfigParams;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/dns_servers.rs b/nexus/src/app/background/tasks/dns_servers.rs
index 8f4cce4ee0..19442f9655 100644
--- a/nexus/src/app/background/tasks/dns_servers.rs
+++ b/nexus/src/app/background/tasks/dns_servers.rs
@@ -4,7 +4,7 @@
 
 //! Background task for keeping track of DNS servers
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use internal_dns::names::ServiceName;
diff --git a/nexus/src/app/background/tasks/external_endpoints.rs b/nexus/src/app/background/tasks/external_endpoints.rs
index 2cc8e18f0d..d0fd0ed20a 100644
--- a/nexus/src/app/background/tasks/external_endpoints.rs
+++ b/nexus/src/app/background/tasks/external_endpoints.rs
@@ -6,7 +6,7 @@
 //! all Silos, their externally-visible DNS names, and the TLS certificates
 //! associated with those names
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use crate::app::external_endpoints::read_all_endpoints;
 pub use crate::app::external_endpoints::ExternalEndpoints;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/instance_watcher.rs b/nexus/src/app/background/tasks/instance_watcher.rs
index 1b10605c5e..e1c94d577d 100644
--- a/nexus/src/app/background/tasks/instance_watcher.rs
+++ b/nexus/src/app/background/tasks/instance_watcher.rs
@@ -4,7 +4,7 @@
 
 //! Background task for pulling instance state from sled-agents.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::{future::BoxFuture, FutureExt};
 use http::StatusCode;
 use nexus_db_model::Instance;
diff --git a/nexus/src/app/background/tasks/inventory_collection.rs b/nexus/src/app/background/tasks/inventory_collection.rs
index 13410eb9d2..dae5ccae8e 100644
--- a/nexus/src/app/background/tasks/inventory_collection.rs
+++ b/nexus/src/app/background/tasks/inventory_collection.rs
@@ -4,7 +4,7 @@
 
 //! Background task for reading inventory for the rack
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use anyhow::ensure;
 use anyhow::Context;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/metrics_producer_gc.rs b/nexus/src/app/background/tasks/metrics_producer_gc.rs
index 2a8464b80f..5dbb16ef80 100644
--- a/nexus/src/app/background/tasks/metrics_producer_gc.rs
+++ b/nexus/src/app/background/tasks/metrics_producer_gc.rs
@@ -5,7 +5,7 @@
 //! Background task for garbage collecting metrics producers that have not
 //! renewed their lease
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use chrono::TimeDelta;
 use chrono::Utc;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/mod.rs b/nexus/src/app/background/tasks/mod.rs
index ae7f8af74e..d4a8733eb6 100644
--- a/nexus/src/app/background/tasks/mod.rs
+++ b/nexus/src/app/background/tasks/mod.rs
@@ -25,6 +25,3 @@ pub mod service_firewall_rules;
 pub mod sync_service_zone_nat;
 pub mod sync_switch_configuration;
 pub mod v2p_mappings;
-
-// XXX-dap fix up all the individual tasks to fix up this import
-use super::common;
diff --git a/nexus/src/app/background/tasks/nat_cleanup.rs b/nexus/src/app/background/tasks/nat_cleanup.rs
index 844dbffefe..399b999340 100644
--- a/nexus/src/app/background/tasks/nat_cleanup.rs
+++ b/nexus/src/app/background/tasks/nat_cleanup.rs
@@ -8,8 +8,8 @@
 
 use crate::app::map_switch_zone_addrs;
 
-use super::common::BackgroundTask;
 use super::networking::build_dpd_clients;
+use crate::app::background::common::BackgroundTask;
 use chrono::{Duration, Utc};
 use futures::future::BoxFuture;
 use futures::FutureExt;
diff --git a/nexus/src/app/background/tasks/phantom_disks.rs b/nexus/src/app/background/tasks/phantom_disks.rs
index 48688838e5..6b128760ed 100644
--- a/nexus/src/app/background/tasks/phantom_disks.rs
+++ b/nexus/src/app/background/tasks/phantom_disks.rs
@@ -18,7 +18,7 @@
 //! this background task is required to apply the same fix for disks that are
 //! already in this phantom state.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use nexus_db_queries::context::OpContext;
diff --git a/nexus/src/app/background/tasks/physical_disk_adoption.rs b/nexus/src/app/background/tasks/physical_disk_adoption.rs
index 05c53963de..db2b126d71 100644
--- a/nexus/src/app/background/tasks/physical_disk_adoption.rs
+++ b/nexus/src/app/background/tasks/physical_disk_adoption.rs
@@ -11,7 +11,7 @@
 //!
 //! In the future, this may become more explicitly operator-controlled.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use nexus_db_model::PhysicalDisk;
diff --git a/nexus/src/app/background/tasks/region_replacement.rs b/nexus/src/app/background/tasks/region_replacement.rs
index 02ae548d75..14e11cc86b 100644
--- a/nexus/src/app/background/tasks/region_replacement.rs
+++ b/nexus/src/app/background/tasks/region_replacement.rs
@@ -10,8 +10,8 @@
 //! for any requests that are in state "Requested". See the documentation there
 //! for more information.
 
-use super::common::BackgroundTask;
 use crate::app::authn;
+use crate::app::background::common::BackgroundTask;
 use crate::app::sagas;
 use crate::app::RegionAllocationStrategy;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/service_firewall_rules.rs b/nexus/src/app/background/tasks/service_firewall_rules.rs
index 1a705d1fae..36a9926518 100644
--- a/nexus/src/app/background/tasks/service_firewall_rules.rs
+++ b/nexus/src/app/background/tasks/service_firewall_rules.rs
@@ -10,7 +10,7 @@
 //! handle general changes to customer-visible VPC firewalls, and is mostly in
 //! place to propagate changes in the IP allowlist for user-facing services.
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use nexus_db_queries::context::OpContext;
diff --git a/nexus/src/app/background/tasks/sync_service_zone_nat.rs b/nexus/src/app/background/tasks/sync_service_zone_nat.rs
index b0a4c8cef2..3152ae468e 100644
--- a/nexus/src/app/background/tasks/sync_service_zone_nat.rs
+++ b/nexus/src/app/background/tasks/sync_service_zone_nat.rs
@@ -7,8 +7,8 @@
 
 use crate::app::map_switch_zone_addrs;
 
-use super::common::BackgroundTask;
 use super::networking::build_dpd_clients;
+use crate::app::background::common::BackgroundTask;
 use anyhow::Context;
 use futures::future::BoxFuture;
 use futures::FutureExt;
diff --git a/nexus/src/app/background/tasks/sync_switch_configuration.rs b/nexus/src/app/background/tasks/sync_switch_configuration.rs
index 7069016bbc..dd21aeca31 100644
--- a/nexus/src/app/background/tasks/sync_switch_configuration.rs
+++ b/nexus/src/app/background/tasks/sync_switch_configuration.rs
@@ -23,7 +23,7 @@ use nexus_db_model::{
 };
 use uuid::Uuid;
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 use display_error_chain::DisplayErrorChain;
 use dpd_client::types::PortId;
 use futures::future::BoxFuture;
diff --git a/nexus/src/app/background/tasks/v2p_mappings.rs b/nexus/src/app/background/tasks/v2p_mappings.rs
index e2318f94d6..16c9d57526 100644
--- a/nexus/src/app/background/tasks/v2p_mappings.rs
+++ b/nexus/src/app/background/tasks/v2p_mappings.rs
@@ -12,7 +12,7 @@ use omicron_common::api::external::Vni;
 use serde_json::json;
 use sled_agent_client::types::VirtualNetworkInterfaceHost;
 
-use super::common::BackgroundTask;
+use crate::app::background::common::BackgroundTask;
 
 pub struct V2PManager {
     datastore: Arc<DataStore>,