diff --git a/src/lib.rs b/src/lib.rs
index 0d15e78..aa1f80a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,11 +33,6 @@ pub use str::{
 
 use std::u32;
 
-pub mod traits {
-    //! All traits are re-exported here to allow glob imports.
-    pub use {Buf, MutBuf, ByteStr, ToBytes};
-}
-
 const MAX_CAPACITY: usize = u32::MAX as usize;
 
 
diff --git a/src/str/bytes.rs b/src/str/bytes.rs
index 1266757..191a67a 100644
--- a/src/str/bytes.rs
+++ b/src/str/bytes.rs
@@ -1,5 +1,6 @@
 use {ByteBuf, SmallByteStr};
-use traits::{Buf, ByteStr, ToBytes};
+use buf::{Buf};
+use str::{ByteStr, ToBytes};
 use std::{fmt, mem, ops, ptr};
 use std::any::{TypeId};
 
diff --git a/src/str/rope.rs b/src/str/rope.rs
index ec7b807..693b889 100644
--- a/src/str/rope.rs
+++ b/src/str/rope.rs
@@ -1,5 +1,6 @@
 use {Bytes, ByteBuf};
-use traits::{Buf, ByteStr, MutBuf, ToBytes};
+use buf::{Buf, MutBuf};
+use str::{ByteStr, ToBytes};
 use std::{cmp, mem, ops};
 use std::sync::Arc;
 
diff --git a/src/str/small.rs b/src/str/small.rs
index 9128a95..c40ad9b 100644
--- a/src/str/small.rs
+++ b/src/str/small.rs
@@ -1,5 +1,6 @@
 use {Bytes, Rope};
-use traits::{Buf, ByteStr, ToBytes};
+use buf::Buf;
+use str::{ByteStr, ToBytes};
 use std::{cmp, ops};
 
 /*
diff --git a/test/test_byte_buf.rs b/test/test_byte_buf.rs
index 110da8a..76709c4 100644
--- a/test/test_byte_buf.rs
+++ b/test/test_byte_buf.rs
@@ -1,5 +1,5 @@
+use bytes::{Buf, MutBuf};
 use bytes::ByteBuf;
-use bytes::traits::*;
 
 #[test]
 pub fn test_initial_buf_empty() {
diff --git a/test/test_ring.rs b/test/test_ring.rs
index f42219f..74dc6bc 100644
--- a/test/test_ring.rs
+++ b/test/test_ring.rs
@@ -2,8 +2,6 @@ use bytes::{RingBuf, Buf, MutBuf};
 
 #[test]
 pub fn test_initial_buf_empty() {
-    use bytes::traits::{Buf, MutBuf};
-
     let mut buf = RingBuf::new(16);
     assert_eq!(MutBuf::remaining(&buf), 16);
     assert_eq!(Buf::remaining(&buf), 0);
@@ -102,8 +100,6 @@ fn test_mark_write() {
 // Test that "RingBuf::reset" does not reset the length of a
 // full buffer to zero.
 fn test_reset_full() {
-    use bytes::traits::MutBuf;
-
     let mut buf = RingBuf::new(8);
     buf.copy_from(&[1, 2, 3, 4, 5, 6, 7, 8][..]).unwrap();
     assert_eq!(MutBuf::remaining(&buf), 0);
@@ -116,8 +112,6 @@ fn test_reset_full() {
 #[test]
 // Test that "RingBuf::clear" does the full reset
 fn test_clear() {
-    use bytes::traits::{Buf, MutBuf};
-
     let mut buf = RingBuf::new(8);
     buf.copy_from(&[0; 8][..]).unwrap();
     assert_eq!(MutBuf::remaining(&buf), 0);
diff --git a/test/test_rope.rs b/test/test_rope.rs
index ded1cd5..f9a2f0c 100644
--- a/test/test_rope.rs
+++ b/test/test_rope.rs
@@ -1,5 +1,4 @@
-use bytes::Rope;
-use bytes::traits::*;
+use bytes::{Buf, Rope, ByteStr, ToBytes};
 use super::gen_bytes;
 
 const TEST_BYTES_1: &'static [u8] =
diff --git a/test/test_seq_byte_str.rs b/test/test_seq_byte_str.rs
index 9e5508e..0a8dd81 100644
--- a/test/test_seq_byte_str.rs
+++ b/test/test_seq_byte_str.rs
@@ -1,5 +1,4 @@
-use bytes::SeqByteStr;
-use bytes::traits::*;
+use bytes::{ByteStr, Buf, SeqByteStr};
 use super::gen_bytes;
 
 #[test]
diff --git a/test/test_small_byte_str.rs b/test/test_small_byte_str.rs
index 454e2d5..07820a8 100644
--- a/test/test_small_byte_str.rs
+++ b/test/test_small_byte_str.rs
@@ -1,5 +1,4 @@
-use bytes::SmallByteStr;
-use bytes::traits::*;
+use bytes::{ByteStr, Buf, SmallByteStr};
 use super::gen_bytes;
 
 #[test]