diff --git a/README.md b/README.md
index 792c6d3e..23bcd4aa 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,6 @@ phf_codegen
 build.rs
 
 ```rust
-extern crate phf_codegen;
-
 use std::env;
 use std::fs::File;
 use std::io::{BufWriter, Write};
@@ -99,8 +97,6 @@ fn main() {
 lib.rs
 
 ```rust
-extern crate phf;
-
 #[derive(Clone)]
 enum Keyword {
     Loop,
diff --git a/phf/src/map.rs b/phf/src/map.rs
index 5f39da1e..ed96e804 100644
--- a/phf/src/map.rs
+++ b/phf/src/map.rs
@@ -94,21 +94,21 @@ impl<K, V> Map<K, V> {
     /// Returns an iterator over the key/value pairs in the map.
     ///
     /// Entries are returned in an arbitrary but fixed order.
-    pub fn entries<'a>(&'a self) -> Entries<'a, K, V> {
+    pub fn entries(&self) -> Entries<K, V> {
         Entries { iter: self.entries.iter() }
     }
 
     /// Returns an iterator over the keys in the map.
     ///
     /// Keys are returned in an arbitrary but fixed order.
-    pub fn keys<'a>(&'a self) -> Keys<'a, K, V> {
+    pub fn keys(&self) -> Keys<K, V> {
         Keys { iter: self.entries() }
     }
 
     /// Returns an iterator over the values in the map.
     ///
     /// Values are returned in an arbitrary but fixed order.
-    pub fn values<'a>(&'a self) -> Values<'a, K, V> {
+    pub fn values(&self) -> Values<K, V> {
         Values { iter: self.entries() }
     }
 }
diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
index fa028d07..356a0e25 100644
--- a/phf/src/ordered_map.rs
+++ b/phf/src/ordered_map.rs
@@ -124,21 +124,21 @@ impl<K, V> OrderedMap<K, V> {
     /// Returns an iterator over the key/value pairs in the map.
     ///
     /// Entries are returned in the same order in which they were defined.
-    pub fn entries<'a>(&'a self) -> Entries<'a, K, V> {
+    pub fn entries(&self) -> Entries<K, V> {
         Entries { iter: self.entries.iter() }
     }
 
     /// Returns an iterator over the keys in the map.
     ///
     /// Keys are returned in the same order in which they were defined.
-    pub fn keys<'a>(&'a self) -> Keys<'a, K, V> {
+    pub fn keys(&self) -> Keys<K, V> {
         Keys { iter: self.entries() }
     }
 
     /// Returns an iterator over the values in the map.
     ///
     /// Values are returned in the same order in which they were defined.
-    pub fn values<'a>(&'a self) -> Values<'a, K, V> {
+    pub fn values(&self) -> Values<K, V> {
         Values { iter: self.entries() }
     }
 }
diff --git a/phf/src/ordered_set.rs b/phf/src/ordered_set.rs
index 9bfea464..1a025bba 100644
--- a/phf/src/ordered_set.rs
+++ b/phf/src/ordered_set.rs
@@ -73,7 +73,7 @@ impl<T> OrderedSet<T> {
     /// Returns an iterator over the values in the set.
     ///
     /// Values are returned in the same order in which they were defined.
-    pub fn iter<'a>(&'a self) -> Iter<'a, T> {
+    pub fn iter(&self) -> Iter<T> {
         Iter { iter: self.map.keys() }
     }
 }
diff --git a/phf/src/set.rs b/phf/src/set.rs
index 1de6536f..c2f0be2e 100644
--- a/phf/src/set.rs
+++ b/phf/src/set.rs
@@ -57,7 +57,7 @@ impl<T> Set<T> {
     /// Returns an iterator over the values in the set.
     ///
     /// Values are returned in an arbitrary but fixed order.
-    pub fn iter<'a>(&'a self) -> Iter<'a, T> {
+    pub fn iter(&self) -> Iter<T> {
         Iter { iter: self.map.keys() }
     }
 }
diff --git a/phf_codegen/test/build.rs b/phf_codegen/test/build.rs
index 593ab988..ce93f621 100644
--- a/phf_codegen/test/build.rs
+++ b/phf_codegen/test/build.rs
@@ -1,6 +1,3 @@
-extern crate phf_codegen;
-extern crate unicase;
-
 use std::env;
 use std::fs::File;
 use std::io::{self, BufWriter, Write};
diff --git a/phf_shared/src/lib.rs b/phf_shared/src/lib.rs
index dc778ca0..ecfa3365 100644
--- a/phf_shared/src/lib.rs
+++ b/phf_shared/src/lib.rs
@@ -4,21 +4,16 @@
 #[cfg(feature = "std")]
 extern crate std as core;
 
-extern crate siphasher;
-
-#[cfg(feature = "unicase")]
-extern crate unicase;
-
 use core::fmt;
 use core::hash::{Hasher, Hash};
 use core::num::Wrapping;
 use siphasher::sip128::{Hash128, Hasher128, SipHasher13};
 
+#[non_exhaustive]
 pub struct Hashes {
     pub g: u32,
     pub f1: u32,
     pub f2: u32,
-    _priv: (),
 }
 
 /// A central typedef for hash keys
@@ -43,7 +38,6 @@ pub fn hash<T: ?Sized + PhfHash>(x: &T, key: &HashKey) -> Hashes {
         g: (lower >> 32) as u32,
         f1: lower as u32,
         f2: upper as u32,
-        _priv: (),
     }
 }