diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs
index b355c75b..b8fd27d9 100644
--- a/crates/egui/src/containers/area.rs
+++ b/crates/egui/src/containers/area.rs
@@ -2,7 +2,7 @@
 //! It has no frame or own size. It is potentially movable.
 //! It is the foundation for windows and popups.
 
-use crate::{layers::ZLayer, *};
+use crate::*;
 
 /// State that is persisted between frames.
 // TODO(emilk): this is not currently stored in `memory().data`, but maybe it should be?
@@ -268,7 +268,7 @@ impl Area {
             let move_response = ctx.interact(
                 Rect::EVERYTHING,
                 ctx.style().spacing.item_spacing,
-                ZLayer::from_area_layer(layer_id),
+                layers::ZLayer::from_area_layer(layer_id),
                 interact_id,
                 state.rect(),
                 sense,
diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs
index b1151dda..db487f3b 100644
--- a/crates/egui/src/context.rs
+++ b/crates/egui/src/context.rs
@@ -2,15 +2,9 @@
 use std::sync::Arc;
 
 use crate::{
-    animation_manager::AnimationManager,
-    data::output::PlatformOutput,
-    frame_state::FrameState,
-    input_state::*,
-    layers::{GraphicLayers, ZLayer, ZOrder},
-    memory::Options,
-    os::OperatingSystem,
-    output::FullOutput,
-    TextureHandle, *,
+    animation_manager::AnimationManager, data::output::PlatformOutput, frame_state::FrameState,
+    input_state::*, layers::GraphicLayers, memory::Options, os::OperatingSystem,
+    output::FullOutput, TextureHandle, *,
 };
 use epaint::{mutex::*, stats::*, text::Fonts, TessellationOptions, *};
 
@@ -70,9 +64,9 @@ struct ContextImpl {
     requested_repaint_last_frame: bool,
 
     /// Written to during the frame.
-    layer_rects_this_frame: ahash::HashMap<AreaLayerId, Vec<(Id, ZOrder, Rect)>>,
+    layer_rects_this_frame: ahash::HashMap<AreaLayerId, Vec<(Id, layers::ZOrder, Rect)>>,
     /// Read
-    layer_rects_prev_frame: ahash::HashMap<AreaLayerId, Vec<(Id, ZOrder, Rect)>>,
+    layer_rects_prev_frame: ahash::HashMap<AreaLayerId, Vec<(Id, layers::ZOrder, Rect)>>,
 
     #[cfg(feature = "accesskit")]
     is_accesskit_enabled: bool,
@@ -383,7 +377,7 @@ impl Context {
         &self,
         clip_rect: Rect,
         item_spacing: Vec2,
-        layer: ZLayer,
+        layer: layers::ZLayer,
         id: Id,
         rect: Rect,
         sense: Sense,
diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs
index 4c11fe85..7a4b1b21 100644
--- a/crates/egui/src/ui.rs
+++ b/crates/egui/src/ui.rs
@@ -6,15 +6,8 @@ use std::sync::Arc;
 use epaint::mutex::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 use crate::{
-    containers::*,
-    ecolor::*,
-    epaint::text::Fonts,
-    layers::{ZLayer, ZOrder},
-    layout::*,
-    menu::MenuState,
-    placer::Placer,
-    widgets::*,
-    *,
+    containers::*, ecolor::*, epaint::text::Fonts, layers::ZLayer, layout::*, menu::MenuState,
+    placer::Placer, widgets::*, *,
 };
 
 // ----------------------------------------------------------------------------
@@ -1768,7 +1761,7 @@ impl Ui {
 
     pub fn with_z<R>(
         &mut self,
-        z: ZOrder,
+        z: layers::ZOrder,
         add_contents: impl FnOnce(&mut Self) -> R,
     ) -> InnerResponse<R> {
         self.scope(|ui| {