diff --git a/examples/helpers/implementations.rs b/examples/helpers/implementations.rs
index e75919d..920034b 100644
--- a/examples/helpers/implementations.rs
+++ b/examples/helpers/implementations.rs
@@ -1,8 +1,9 @@
 use super::WindowMap;
 use rand;
-use smithay::wayland::compositor::{compositor_init, CompositorToken, SurfaceAttributes, SurfaceUserImplementation};
+use smithay::wayland::compositor::{compositor_init, CompositorToken, SurfaceAttributes,
+                                   SurfaceUserImplementation};
 use smithay::wayland::shell::{shell_init, PopupConfigure, ShellState, ShellSurfaceRole,
-                     ShellSurfaceUserImplementation, ToplevelConfigure};
+                              ShellSurfaceUserImplementation, ToplevelConfigure};
 use smithay::wayland::shm::with_buffer_contents;
 use std::cell::RefCell;
 use std::rc::Rc;
diff --git a/examples/helpers/window_map.rs b/examples/helpers/window_map.rs
index a2dda9f..7486f13 100644
--- a/examples/helpers/window_map.rs
+++ b/examples/helpers/window_map.rs
@@ -1,7 +1,7 @@
+use smithay::utils::Rectangle;
 use smithay::wayland::compositor::{CompositorToken, SubsurfaceRole, SurfaceAttributes, TraversalAction};
 use smithay::wayland::compositor::roles::Role;
 use smithay::wayland::shell::{ShellSurfaceRole, ToplevelSurface};
-use smithay::utils::Rectangle;
 use wayland_server::Resource;
 use wayland_server::protocol::wl_surface;
 
diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs
index 165cef2..5432f40 100644
--- a/src/wayland/mod.rs
+++ b/src/wayland/mod.rs
@@ -6,4 +6,4 @@
 pub mod compositor;
 pub mod seat;
 pub mod shm;
-pub mod shell;
\ No newline at end of file
+pub mod shell;
diff --git a/src/wayland/shell/mod.rs b/src/wayland/shell/mod.rs
index 16cdd50..6174250 100644
--- a/src/wayland/shell/mod.rs
+++ b/src/wayland/shell/mod.rs
@@ -105,11 +105,11 @@
 //! access from the `state()` of the event loop and the token returned by the init
 //! function.
 
-use wayland::compositor::CompositorToken;
-use wayland::compositor::roles::Role;
 use std::cell::RefCell;
 use std::rc::Rc;
 use utils::Rectangle;
+use wayland::compositor::CompositorToken;
+use wayland::compositor::roles::Role;
 use wayland_protocols::unstable::xdg_shell::server::{zxdg_popup_v6, zxdg_positioner_v6 as xdg_positioner,
                                                      zxdg_shell_v6, zxdg_surface_v6, zxdg_toplevel_v6};
 use wayland_server::{EventLoop, EventLoopHandle, EventResult, Global, Liveness, Resource, StateToken};
diff --git a/src/wayland/shell/wl_handlers.rs b/src/wayland/shell/wl_handlers.rs
index 2586064..3f77e5b 100644
--- a/src/wayland/shell/wl_handlers.rs
+++ b/src/wayland/shell/wl_handlers.rs
@@ -1,10 +1,10 @@
 use super::{make_shell_client_data, PopupConfigure, PopupState, PositionerState, ShellClient,
             ShellClientData, ShellSurfaceIData, ShellSurfacePendingState, ShellSurfaceRole,
             ToplevelConfigure, ToplevelState};
-use wayland::compositor::CompositorToken;
-use wayland::compositor::roles::*;
 use std::sync::Mutex;
 use utils::Rectangle;
+use wayland::compositor::CompositorToken;
+use wayland::compositor::roles::*;
 use wayland_protocols::unstable::xdg_shell::server::{zxdg_positioner_v6 as xdg_positioner, zxdg_toplevel_v6};
 use wayland_server::{Client, EventLoopHandle, Resource};
 use wayland_server::protocol::{wl_output, wl_shell, wl_shell_surface, wl_surface};
diff --git a/src/wayland/shell/xdg_handlers.rs b/src/wayland/shell/xdg_handlers.rs
index 233cfb8..cfbb18e 100644
--- a/src/wayland/shell/xdg_handlers.rs
+++ b/src/wayland/shell/xdg_handlers.rs
@@ -1,10 +1,10 @@
 use super::{make_shell_client_data, PopupConfigure, PopupState, PositionerState, ShellClient,
             ShellClientData, ShellSurfaceIData, ShellSurfacePendingState, ShellSurfaceRole,
             ToplevelConfigure, ToplevelState};
-use wayland::compositor::CompositorToken;
-use wayland::compositor::roles::*;
 use std::sync::Mutex;
 use utils::Rectangle;
+use wayland::compositor::CompositorToken;
+use wayland::compositor::roles::*;
 use wayland_protocols::unstable::xdg_shell::server::{zxdg_popup_v6, zxdg_positioner_v6, zxdg_shell_v6,
                                                      zxdg_surface_v6, zxdg_toplevel_v6};
 use wayland_server::{Client, EventLoopHandle, Resource};