diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index d64dd5ba502c96aa6dda7c0e97c106029a235a85..9e273d545eb9426b0c062b63c45416592f773408 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1,4 +1,16 @@
+use anyhow::Result;
 use collections::HashMap;
+use db::kvp::KEY_VALUE_STORE;
+use git::repository::GitFileStatus;
+use gpui::{
+    actions, prelude::*, uniform_list, Action, AppContext, AsyncWindowContext, ClickEvent,
+    CursorStyle, EventEmitter, FocusHandle, FocusableView, KeyContext,
+    ListHorizontalSizingBehavior, ListSizingBehavior, Model, Modifiers, ModifiersChangedEvent,
+    MouseButton, Stateful, Task, UniformListScrollHandle, View, WeakView,
+};
+use project::{Entry, EntryKind, Fs, Project, ProjectEntryId, WorktreeId};
+use serde::{Deserialize, Serialize};
+use settings::Settings as _;
 use std::{
     cell::OnceCell,
     collections::HashSet,
@@ -8,19 +20,10 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-
-use git::repository::GitFileStatus;
-
-use util::{ResultExt, TryFutureExt};
-
-use db::kvp::KEY_VALUE_STORE;
-use gpui::*;
-use project::{Entry, EntryKind, Fs, Project, ProjectEntryId, WorktreeId};
-use serde::{Deserialize, Serialize};
-use settings::Settings as _;
 use ui::{
     prelude::*, Checkbox, Divider, DividerColor, ElevationIndex, Scrollbar, ScrollbarState, Tooltip,
 };
+use util::{ResultExt, TryFutureExt};
 use workspace::dock::{DockPosition, Panel, PanelEvent};
 use workspace::Workspace;
 
diff --git a/crates/ui/src/components/tool_strip.rs b/crates/ui/src/components/tool_strip.rs
index 707c5ed06d126235b473f714f11950d090e29c18..ff08fda44538a5af2db52a44b592b8cde2a00f20 100644
--- a/crates/ui/src/components/tool_strip.rs
+++ b/crates/ui/src/components/tool_strip.rs
@@ -1,7 +1,8 @@
 #![allow(missing_docs)]
 
+use gpui::Axis;
+
 use crate::prelude::*;
-use gpui::*;
 
 #[derive(IntoElement)]
 pub struct ToolStrip {
diff --git a/crates/ui_input/src/ui_input.rs b/crates/ui_input/src/ui_input.rs
index b182e617e6628cf0c52bb53a96c7c24462ce604c..04e2ccb85837ef7e1e6a833120847c334cd99e36 100644
--- a/crates/ui_input/src/ui_input.rs
+++ b/crates/ui_input/src/ui_input.rs
@@ -5,11 +5,11 @@
 //! It can't be located in the `ui` crate because it depends on `editor`.
 //!
 
-use editor::*;
-use gpui::*;
+use editor::{Editor, EditorElement, EditorStyle};
+use gpui::{AppContext, FocusHandle, FocusableView, FontStyle, Hsla, TextStyle, View};
 use settings::Settings;
 use theme::ThemeSettings;
-use ui::*;
+use ui::prelude::*;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum FieldLabelLayout {