diff --git a/src/action/exists.rs b/src/action/exists.rs
index a8905f6..bb39b95 100644
--- a/src/action/exists.rs
+++ b/src/action/exists.rs
@@ -3,7 +3,6 @@ use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
 use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
 
 use client::create_client;
-#[cfg(feature = "history")]
 use cmd::matcher::main::MainMatcher;
 use cmd::matcher::{exists::ExistsMatcher, Matcher};
 use error::ActionError;
@@ -26,7 +25,6 @@ impl<'a> Exists<'a> {
     pub fn invoke(&self) -> Result<(), ActionError> {
         // Create the command matchers
         let matcher_exists = ExistsMatcher::with(self.cmd_matches).unwrap();
-        #[cfg(feature = "history")]
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
 
         // Get the share URL
diff --git a/src/cmd/handler.rs b/src/cmd/handler.rs
index 11fadab..6d80e80 100644
--- a/src/cmd/handler.rs
+++ b/src/cmd/handler.rs
@@ -21,7 +21,9 @@ use util::app_history_file_path_string;
 lazy_static! {
     /// The default history file
     static ref DEFAULT_HISTORY_FILE: String = app_history_file_path_string();
+}
 
+lazy_static! {
     /// The default client timeout in seconds as a string
     static ref DEFAULT_TIMEOUT: String = format!("{}", CLIENT_TIMEOUT);
 
diff --git a/src/main.rs b/src/main.rs
index 1f2f83b..4489ec2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,7 +7,6 @@ extern crate derive_builder;
 #[macro_use]
 extern crate failure;
 extern crate ffsend_api;
-#[cfg(feature = "history")]
 #[macro_use]
 extern crate lazy_static;
 extern crate openssl_probe;