diff --git a/pcd-loader.cabal b/pcd-loader.cabal
--- a/pcd-loader.cabal
+++ b/pcd-loader.cabal
@@ -1,5 +1,5 @@
 name:                pcd-loader
-version:             0.2.3.1
+version:             0.2.3.2
 synopsis:            PCD file loader.
 description:         Parser for PCD (point cloud data) formats.  See
                      <http://pointclouds.org/documentation/tutorials/pcd_file_format.php>
@@ -20,7 +20,6 @@
 library
   exposed-modules:  PCD.Data, PCD.Header, PCD.Internal.Types, 
                     PCD.Internal.StorableFieldType
-  other-modules:    PCD.Internal.SmallLens
   ghc-options:      -O2 -Wall
   hs-source-dirs:   src
   build-depends:    base >= 4.6 && < 5, text, mtl, lens, vector, bytestring, 
diff --git a/src/PCD/Data.hs b/src/PCD/Data.hs
--- a/src/PCD/Data.hs
+++ b/src/PCD/Data.hs
@@ -6,6 +6,7 @@
                  projectBinaryFields, mkSimpleHeader, mkHeaderXYZ) where
 import Control.Applicative
 import Control.DeepSeq
+import Control.Lens ((.~), (^.))
 import Control.Monad (when)
 import Data.Attoparsec.Text hiding (I)
 import qualified Data.Attoparsec.Text.Lazy as ATL
@@ -22,7 +23,6 @@
 import System.IO (Handle, openFile, hClose, 
                   IOMode(..), withBinaryFile, hPutBuf, hGetBuf)
 import PCD.Header
-import PCD.Internal.SmallLens
 import PCD.Internal.StorableFieldType
 import PCD.Internal.Types
 
diff --git a/src/PCD/Header.hs b/src/PCD/Header.hs
--- a/src/PCD/Header.hs
+++ b/src/PCD/Header.hs
@@ -5,6 +5,7 @@
 module PCD.Header where
 import Control.Applicative
 import Control.Arrow ((***))
+import Control.Lens (makeLenses, (^.), (%~), (.=), _1, _2, use, Setting)
 import Control.Monad.State
 import Data.Foldable (Foldable, foldMap)
 import Data.Int
@@ -17,7 +18,6 @@
 import Data.Attoparsec.Text hiding (I)
 import System.IO (Handle)
 import Control.DeepSeq
-import PCD.Internal.SmallLens
 import PCD.Internal.Types
 
 -- |Fields attached to a point may be signed integers (I), unsigned
diff --git a/src/PCD/Internal/SmallLens.hs b/src/PCD/Internal/SmallLens.hs
deleted file mode 100644
--- a/src/PCD/Internal/SmallLens.hs
+++ /dev/null
@@ -1,45 +0,0 @@
--- |Re-export the lens package without the Zipper module whose names
--- tend to clash.
-module PCD.Internal.SmallLens ( module Control.Lens.Type
-                              , module Control.Lens.Traversal
-                              , module Control.Lens.Getter
-                              , module Control.Lens.Setter
-                              , module Control.Lens.Action
-                              , module Control.Lens.Combinators
-                              , module Control.Lens.Fold
-                              , module Control.Lens.Iso
-                              , module Control.Lens.Indexed
-                              , module Control.Lens.IndexedFold
-                              , module Control.Lens.IndexedGetter
-                              , module Control.Lens.IndexedLens
-                              , module Control.Lens.IndexedTraversal
-                              , module Control.Lens.IndexedSetter
-                              , module Control.Lens.Plated
-                              , module Control.Lens.Projection
-                              , module Control.Lens.Representable
-                              , module Control.Lens.TH
-                              , module Control.Lens.Tuple
-                              , module Control.Lens.WithIndex
-                              , module Control.Lens.Zoom ) where
-import Control.Lens.Type
-import Control.Lens.Traversal
-import Control.Lens.Getter
-import Control.Lens.Setter
-import Control.Lens.Action
-import Control.Lens.Combinators
-import Control.Lens.Fold
-import Control.Lens.Iso
-import Control.Lens.Indexed
-import Control.Lens.IndexedFold
-import Control.Lens.IndexedGetter
-import Control.Lens.IndexedLens
-import Control.Lens.IndexedTraversal
-import Control.Lens.IndexedSetter
-import Control.Lens.Plated
-import Control.Lens.Projection
-import Control.Lens.Representable
-import Control.Lens.TH
-import Control.Lens.Tuple
-import Control.Lens.WithIndex
-import Control.Lens.Zoom
-