Fix windows compile errors

7 files changed, 12 insertions, 10 deletions

diff --git a/talpid-core/src/dns/mod.rs b/talpid-core/src/dns/mod.rs
index 2631be00a9..5353167ea9 100644
--- a/talpid-core/src/dns/mod.rs
+++ b/talpid-core/src/dns/mod.rs
@@ -9,7 +9,7 @@ mod imp;
 mod imp;
 
 #[cfg(windows)]
-#[path = "windows.rs"]
+#[path = "windows/mod.rs"]
 mod imp;
 
 pub use self::imp::Error;
diff --git a/talpid-core/src/dns/windows.rs b/talpid-core/src/dns/windows/mod.rs
index 6f7cf3f07f..dfa239cb81 100644
--- a/talpid-core/src/dns/windows.rs
+++ b/talpid-core/src/dns/windows/mod.rs
@@ -7,10 +7,12 @@ use std::{
     ptr, slice,
 };
 
+mod system_state;
+use self::system_state::SystemStateWriter;
+
 use error_chain::ChainedError;
 use widestring::WideCString;
 
-use super::system_state::SystemStateWriter;
 
 const DNS_STATE_FILENAME: &'static str = "dns-state-backup";
 
diff --git a/talpid-core/src/firewall/windows/system_state.rs b/talpid-core/src/dns/windows/system_state.rs
index f5e1d073dd..f5e1d073dd 100644
--- a/talpid-core/src/firewall/windows/system_state.rs
+++ b/talpid-core/src/dns/windows/system_state.rs
diff --git a/talpid-core/src/firewall/windows/ffi.rs b/talpid-core/src/ffi.rs
index 6c4d8381d4..6c4d8381d4 100644
--- a/talpid-core/src/firewall/windows/ffi.rs
+++ b/talpid-core/src/ffi.rs
diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs
index 5163d4ed26..2bdb58f27c 100644
--- a/talpid-core/src/firewall/mod.rs
+++ b/talpid-core/src/firewall/mod.rs
@@ -3,8 +3,8 @@ use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
 #[cfg(unix)]
 use lazy_static::lazy_static;
 #[cfg(unix)]
-use std::net::{Ipv4Addr, Ipv6Addr};
-use std::{fmt, net::IpAddr};
+use std::net::{Ipv4Addr, Ipv6Addr, IpAddr};
+use std::fmt;
 use talpid_types::net::Endpoint;
 
 
@@ -17,7 +17,7 @@ mod imp;
 mod imp;
 
 #[cfg(windows)]
-#[path = "windows/mod.rs"]
+#[path = "windows.rs"]
 mod imp;
 
 pub use self::imp::Error;
diff --git a/talpid-core/src/firewall/windows/mod.rs b/talpid-core/src/firewall/windows.rs
index 398297cd59..157f5a7061 100644
--- a/talpid-core/src/firewall/windows/mod.rs
+++ b/talpid-core/src/firewall/windows.rs
@@ -7,11 +7,6 @@ use log::{debug, error, trace};
 use talpid_types::net::Endpoint;
 use widestring::WideCString;
 
-#[macro_use]
-mod ffi;
-
-mod system_state;
-
 error_chain! {
     errors {
         /// Failure to initialize windows firewall module
diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs
index d997d90c76..8e63d2bfa8 100644
--- a/talpid-core/src/lib.rs
+++ b/talpid-core/src/lib.rs
@@ -13,6 +13,11 @@
 #[macro_use]
 extern crate error_chain;
 
+/// Misc FFI utilities.
+#[cfg(windows)]
+#[macro_use]
+mod ffi;
+
 #[cfg(windows)]
 mod winnet;