diff --git a/src/angle.rs b/src/angle.rs
index 24eb535..0526017 100644
--- a/src/angle.rs
+++ b/src/angle.rs
@@ -21,10 +21,10 @@ use std::ops::*;
 
 use rand::{Rand, Rng};
 use rand::distributions::range::SampleRange;
-use num_traits::{Float, Zero};
+use num_traits::Float;
 use num_traits::cast;
 
-use structure::Angle;
+use structure::*;
 
 use approx::ApproxEq;
 use num::BaseFloat;
diff --git a/src/euler.rs b/src/euler.rs
index 32a66aa..ec28b45 100644
--- a/src/euler.rs
+++ b/src/euler.rs
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use rand::{Rand, Rng};
-use num_traits::{cast, Zero};
+use num_traits::cast;
 
 use structure::*;
 
diff --git a/src/lib.rs b/src/lib.rs
index 17fc201..6f33b80 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -72,8 +72,6 @@ pub use transform::*;
 
 pub use projection::*;
 
-pub use num_traits::{One, Zero};
-
 // Modules
 
 pub mod conv;
diff --git a/src/matrix.rs b/src/matrix.rs
index 97c3089..9d444b9 100644
--- a/src/matrix.rs
+++ b/src/matrix.rs
@@ -14,7 +14,6 @@
 // limitations under the License.
 
 use rand::{Rand, Rng};
-use num_traits::{Zero, One};
 use num_traits::cast;
 use std::fmt;
 use std::mem;
diff --git a/src/point.rs b/src/point.rs
index 31cde6b..4a808a2 100644
--- a/src/point.rs
+++ b/src/point.rs
@@ -21,8 +21,6 @@ use std::fmt;
 use std::mem;
 use std::ops::*;
 
-use num_traits::{One, Zero};
-
 use structure::*;
 
 use approx::ApproxEq;
diff --git a/src/quaternion.rs b/src/quaternion.rs
index f94df92..a630934 100644
--- a/src/quaternion.rs
+++ b/src/quaternion.rs
@@ -17,7 +17,7 @@ use std::mem;
 use std::ops::*;
 
 use rand::{Rand, Rng};
-use num_traits::{Float, One, Zero};
+use num_traits::Float;
 use num_traits::cast;
 
 use structure::*;
diff --git a/src/structure.rs b/src/structure.rs
index 03b0646..d4771f2 100644
--- a/src/structure.rs
+++ b/src/structure.rs
@@ -15,7 +15,7 @@
 
 //! Generic algebraic structures
 
-use num_traits::{cast, Float, One, Zero};
+use num_traits::{cast, Float};
 use std::cmp;
 use std::ops::*;
 
@@ -24,6 +24,8 @@ use approx::ApproxEq;
 use angle::Rad;
 use num::{BaseNum, BaseFloat, PartialOrd};
 
+pub use num_traits::{One, Zero};
+
 /// An array containing elements of type `Element`
 pub trait Array where
     // FIXME: Ugly type signatures - blocked by rust-lang/rust#24092
diff --git a/src/transform.rs b/src/transform.rs
index 93ccb18..3bf6a1d 100644
--- a/src/transform.rs
+++ b/src/transform.rs
@@ -15,8 +15,6 @@
 
 use std::fmt;
 
-use num_traits::{Zero, One};
-
 use structure::*;
 
 use approx::ApproxEq;
diff --git a/src/vector.rs b/src/vector.rs
index 8bcffa6..d5d0650 100644
--- a/src/vector.rs
+++ b/src/vector.rs
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use rand::{Rand, Rng};
-use num_traits::{NumCast, Zero, One};
+use num_traits::NumCast;
 use std::fmt;
 use std::mem;
 use std::ops::*;