14 files changed, 21 insertions, 15 deletions
diff --git a/nftnl/src/batch.rs b/nftnl/src/batch.rs
index 9b5e7ad..3049f3f 100644
--- a/nftnl/src/batch.rs
+++ b/nftnl/src/batch.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_void};
+use nftnl_sys::{self as sys, libc::c_void};
 
 use std::ptr;
 use {ErrorKind, MsgType, NlMsg, Result};
@@ -103,7 +103,7 @@ impl FinalizedBatch {
             };
             num_pages
         ];
-        let iovecs_ptr = iovecs.as_mut_ptr() as *mut sys::iovec;
+        let iovecs_ptr = iovecs.as_mut_ptr() as *mut sys::libc::iovec;
         unsafe {
             sys::nftnl_batch_iovec(self.batch.as_raw_batch(), iovecs_ptr, num_pages as u32);
         }
diff --git a/nftnl/src/chain.rs b/nftnl/src/chain.rs
index a995c05..6d5c883 100644
--- a/nftnl/src/chain.rs
+++ b/nftnl/src/chain.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_void};
+use nftnl_sys::{self as sys, libc::c_void};
 
 use std::ffi::CStr;
 
diff --git a/nftnl/src/expr/bitwise.rs b/nftnl/src/expr/bitwise.rs
index 2c29c7d..8c8191f 100644
--- a/nftnl/src/expr/bitwise.rs
+++ b/nftnl/src/expr/bitwise.rs
@@ -1,5 +1,8 @@
 use libc;
-use nftnl_sys::{self as sys, c_char, c_void};
+use nftnl_sys::{
+    self as sys,
+    libc::{c_char, c_void},
+};
 
 use super::Expression;
 use expr::cmp::ToSlice;
diff --git a/nftnl/src/expr/cmp.rs b/nftnl/src/expr/cmp.rs
index 5124149..5127bc9 100644
--- a/nftnl/src/expr/cmp.rs
+++ b/nftnl/src/expr/cmp.rs
@@ -1,5 +1,8 @@
 use libc;
-use nftnl_sys::{self as sys, c_char, c_void};
+use nftnl_sys::{
+    self as sys,
+    libc::{c_char, c_void},
+};
 
 use std::borrow::Cow;
 use std::ffi::CString;
diff --git a/nftnl/src/expr/counter.rs b/nftnl/src/expr/counter.rs
index 605bdbb..c7be911 100644
--- a/nftnl/src/expr/counter.rs
+++ b/nftnl/src/expr/counter.rs
@@ -1,5 +1,5 @@
 use super::Expression;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 use {ErrorKind, Result};
 
 /// A counter expression adds a counter to the rule that is incremented to count number of packets
diff --git a/nftnl/src/expr/ct.rs b/nftnl/src/expr/ct.rs
index 78a2dd4..dfcd332 100644
--- a/nftnl/src/expr/ct.rs
+++ b/nftnl/src/expr/ct.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 
 use super::Expression;
 use {ErrorKind, Result};
diff --git a/nftnl/src/expr/immediate.rs b/nftnl/src/expr/immediate.rs
index 355a971..cfcf5d6 100644
--- a/nftnl/src/expr/immediate.rs
+++ b/nftnl/src/expr/immediate.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 
 use super::Expression;
 use {ErrorKind, Result};
diff --git a/nftnl/src/expr/lookup.rs b/nftnl/src/expr/lookup.rs
index 7f4932b..8c4bae3 100644
--- a/nftnl/src/expr/lookup.rs
+++ b/nftnl/src/expr/lookup.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 
 use std::ffi::CString;
 
diff --git a/nftnl/src/expr/meta.rs b/nftnl/src/expr/meta.rs
index 8fa4a85..9b845ee 100644
--- a/nftnl/src/expr/meta.rs
+++ b/nftnl/src/expr/meta.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 
 use super::Expression;
 use {ErrorKind, Result};
diff --git a/nftnl/src/expr/payload.rs b/nftnl/src/expr/payload.rs
index f039ad5..5b9c694 100644
--- a/nftnl/src/expr/payload.rs
+++ b/nftnl/src/expr/payload.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_char};
+use nftnl_sys::{self as sys, libc::c_char};
 
 use super::Expression;
 use {ErrorKind, Result};
diff --git a/nftnl/src/lib.rs b/nftnl/src/lib.rs
index 96e0e26..b9d12ea 100644
--- a/nftnl/src/lib.rs
+++ b/nftnl/src/lib.rs
@@ -8,7 +8,7 @@ extern crate libc;
 #[macro_use]
 extern crate log;
 
-use nftnl_sys::c_void;
+use nftnl_sys::libc::c_void;
 
 pub use error_chain::ChainedError;
 error_chain! {
diff --git a/nftnl/src/rule.rs b/nftnl/src/rule.rs
index 4e4042c..703c32d 100644
--- a/nftnl/src/rule.rs
+++ b/nftnl/src/rule.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_void};
+use nftnl_sys::{self as sys, libc::c_void};
 
 use chain::Chain;
 use expr::Expression;
diff --git a/nftnl/src/set.rs b/nftnl/src/set.rs
index c987783..2adcb9d 100644
--- a/nftnl/src/set.rs
+++ b/nftnl/src/set.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_void};
+use nftnl_sys::{self as sys, libc::c_void};
 
 use std::cell::Cell;
 use std::ffi::CStr;
diff --git a/nftnl/src/table.rs b/nftnl/src/table.rs
index 5066193..fed32fc 100644
--- a/nftnl/src/table.rs
+++ b/nftnl/src/table.rs
@@ -1,5 +1,5 @@
 use libc;
-use nftnl_sys::{self as sys, c_void};
+use nftnl_sys::{self as sys, libc::c_void};
 
 use std::ffi::CStr;