8 files changed, 8 insertions, 7 deletions
diff --git a/mullvad-daemon/src/device/mod.rs b/mullvad-daemon/src/device/mod.rs
index 22a073738d..b220e1e009 100644
--- a/mullvad-daemon/src/device/mod.rs
+++ b/mullvad-daemon/src/device/mod.rs
@@ -78,7 +78,7 @@ pub enum Error {
 }
 
 /// Contains the current device state.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum PrivateDeviceState {
     LoggedIn(PrivateAccountAndDevice),
@@ -139,7 +139,7 @@ impl From<PrivateDeviceState> for DeviceState {
 }
 
 /// Same as [PrivateDevice] but also contains the associated account token.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, PartialEq, Eq)]
 pub struct PrivateAccountAndDevice {
     pub account_token: AccountToken,
     pub device: PrivateDevice,
@@ -155,7 +155,7 @@ impl From<PrivateAccountAndDevice> for AccountAndDevice {
 }
 
 /// Device type that contains private data.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize, PartialEq, Eq)]
 pub struct PrivateDevice {
     pub id: DeviceId,
     pub name: DeviceName,
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index fcb07bba7a..9ab6967d88 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -1,9 +1,6 @@
 #![deny(rust_2018_idioms)]
 #![recursion_limit = "512"]
 
-#[macro_use]
-extern crate serde;
-
 pub mod account_history;
 mod api;
 #[cfg(not(target_os = "android"))]
diff --git a/mullvad-daemon/src/migrations/v1.rs b/mullvad-daemon/src/migrations/v1.rs
index c8d6f9d585..243f9ec735 100644
--- a/mullvad-daemon/src/migrations/v1.rs
+++ b/mullvad-daemon/src/migrations/v1.rs
@@ -1,5 +1,6 @@
 use super::Result;
 use mullvad_types::{relay_constraints::Constraint, settings::SettingsVersion};
+use serde::{Deserialize, Serialize};
 
 // ======================================================
 // Section for vendoring types and values that
diff --git a/mullvad-daemon/src/migrations/v3.rs b/mullvad-daemon/src/migrations/v3.rs
index 887a45976d..fae951c5de 100644
--- a/mullvad-daemon/src/migrations/v3.rs
+++ b/mullvad-daemon/src/migrations/v3.rs
@@ -1,5 +1,6 @@
 use super::{Error, Result};
 use mullvad_types::settings::SettingsVersion;
+use serde::{Deserialize, Serialize};
 use std::net::IpAddr;
 
 // ======================================================
diff --git a/mullvad-daemon/src/migrations/v4.rs b/mullvad-daemon/src/migrations/v4.rs
index 1c30c7d220..fcabfbcacb 100644
--- a/mullvad-daemon/src/migrations/v4.rs
+++ b/mullvad-daemon/src/migrations/v4.rs
@@ -1,5 +1,6 @@
 use super::{Error, Result};
 use mullvad_types::{relay_constraints::Constraint, settings::SettingsVersion};
+use serde::{Deserialize, Serialize};
 
 // ======================================================
 // Section for vendoring types and values that
diff --git a/mullvad-daemon/src/migrations/v5.rs b/mullvad-daemon/src/migrations/v5.rs
index cfce5c696d..4c454bc453 100644
--- a/mullvad-daemon/src/migrations/v5.rs
+++ b/mullvad-daemon/src/migrations/v5.rs
@@ -1,5 +1,6 @@
 use super::{Error, Result};
 use mullvad_types::{relay_constraints::Constraint, settings::SettingsVersion};
+use serde::{Deserialize, Serialize};
 
 // ======================================================
 // Section for vendoring types and values that
diff --git a/mullvad-daemon/src/migrations/v6.rs b/mullvad-daemon/src/migrations/v6.rs
index 3a842923f0..70b92d372c 100644
--- a/mullvad-daemon/src/migrations/v6.rs
+++ b/mullvad-daemon/src/migrations/v6.rs
@@ -1,5 +1,6 @@
 use super::{Error, Result};
 use mullvad_types::{relay_constraints::Constraint, settings::SettingsVersion};
+use serde::{Deserialize, Serialize};
 
 // ======================================================
 // Section for vendoring types and values that
diff --git a/mullvad-nsis/build.rs b/mullvad-nsis/build.rs
index 1765ff54ed..db54faa78a 100644
--- a/mullvad-nsis/build.rs
+++ b/mullvad-nsis/build.rs
@@ -1,7 +1,6 @@
 fn main() {
     #[cfg(all(target_arch = "x86", target_os = "windows"))]
     {
-        extern crate cbindgen;
         use std::env;
 
         let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();