diff --git a/src/ctrlc/unix.rs b/src/ctrlc/unix.rs
index 329f807d..46c7c10e 100644
--- a/src/ctrlc/unix.rs
+++ b/src/ctrlc/unix.rs
@@ -1,3 +1,4 @@
+use lazy_static::lazy_static;
 use nix::sys::signal;
 use std::sync::atomic::{AtomicBool, Ordering};
 
diff --git a/src/git.rs b/src/git.rs
index cc6df9d8..08de3b1e 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -2,6 +2,7 @@ use super::executor::Executor;
 use super::terminal::Terminal;
 use super::utils::{which, Check};
 use failure::Error;
+use log::{debug, error};
 use std::collections::HashSet;
 use std::io;
 use std::path::{Path, PathBuf};
diff --git a/src/main.rs b/src/main.rs
index 39fbf3a0..77de9cee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,20 +8,17 @@ extern crate toml;
 extern crate serde_derive;
 #[macro_use]
 extern crate structopt;
-extern crate serde;
-extern crate shellexpand;
-#[macro_use]
-extern crate log;
 extern crate console;
 extern crate env_logger;
 #[cfg(unix)]
-extern crate nix;
-#[cfg(unix)]
-#[macro_use]
 extern crate lazy_static;
+extern crate log;
+#[cfg(unix)]
+extern crate nix;
 #[cfg(feature = "self-update")]
-#[macro_use]
 extern crate self_update;
+extern crate serde;
+extern crate shellexpand;
 extern crate walkdir;
 
 #[cfg(target_os = "freebsd")]
@@ -125,7 +122,7 @@ pub fn self_update(terminal: &mut Terminal) -> Result<(), Error> {
         .bin_name("topgrade")
         .show_output(false)
         .show_download_progress(true)
-        .current_version(cargo_crate_version!())
+        .current_version(self_update::cargo_crate_version!())
         .no_confirm(true)
         .build()?
         .update()?;
diff --git a/src/utils.rs b/src/utils.rs
index 16efdba8..08b4f64b 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,4 +1,5 @@
 use failure::Error;
+use log::{debug, error};
 use std::ffi::OsStr;
 use std::fmt::Debug;
 use std::path::{Path, PathBuf};
diff --git a/src/windows.rs b/src/windows.rs
index 4dd7e32e..d1d2bbbc 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -2,6 +2,7 @@ use super::executor::Executor;
 use super::terminal::Terminal;
 use super::utils::{self, which, Check};
 use failure;
+use log::error;
 use std::path::PathBuf;
 use std::process::Command;