11 files changed, 4 insertions, 20 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 508af22c..42db998a 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -130,6 +130,8 @@ library
 --                     , bits-atomic >= 0.1
 
   extensions:          PatternGuards
+                     , OverloadedStrings
+                     , RecordWildCards
   hs-source-dirs:      src
   if flag(testing)
     cpp-options:       -DTESTING
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 1dab1541..36974ccf 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -16,8 +16,6 @@
 --   <http://www.bittorrent.org/beps/bep_0003.html#metainfo-files>,
 --   <https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure>
 --
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE CPP                        #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE BangPatterns               #-}
diff --git a/src/Network/BitTorrent/DHT/Protocol.hs b/src/Network/BitTorrent/DHT/Protocol.hs
index 5cc1722d..b0100b70 100644
--- a/src/Network/BitTorrent/DHT/Protocol.hs
+++ b/src/Network/BitTorrent/DHT/Protocol.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
 module Network.BitTorrent.DHT.Protocol
        (
          newNodeSession
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 71be3f88..dc41b08e 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -39,10 +39,8 @@
 --
 --   Finally we get a simple event-based communication model.
 --
-{-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE BangPatterns               #-}
 module Network.BitTorrent.Exchange
        ( P2P
diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index 573a6e5c..8461745a 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -25,8 +25,6 @@
 --   For more infomation see:
 --   <https://wiki.theory.org/BitTorrentSpecification#Peer_wire_protocol_.28TCP.29>
 --
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
 {-# LANGUAGE TemplateHaskell   #-}
 {-# OPTIONS  -fno-warn-orphans #-}
 module Network.BitTorrent.Exchange.Protocol
diff --git a/src/Network/BitTorrent/Extension.hs b/src/Network/BitTorrent/Extension.hs
index a498bc19..c0eb058f 100644
--- a/src/Network/BitTorrent/Extension.hs
+++ b/src/Network/BitTorrent/Extension.hs
@@ -10,7 +10,6 @@
 --   See <http://www.bittorrent.org/beps/bep_0004.html> for more
 --   information.
 --
-{-# LANGUAGE OverloadedStrings #-}
 module Network.BitTorrent.Extension
        ( -- * Capabilities
          Capabilities
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 27f9ac10..a4d026dc 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -28,8 +28,6 @@
 --     capabilities (such as supported enchancements), this should be
 --     done using 'Network.BitTorrent.Extension'!
 --
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TemplateHaskell            #-}
diff --git a/src/Network/BitTorrent/Sessions.hs b/src/Network/BitTorrent/Sessions.hs
index 6b73dd6c..8bfa64d1 100644
--- a/src/Network/BitTorrent/Sessions.hs
+++ b/src/Network/BitTorrent/Sessions.hs
@@ -5,8 +5,6 @@
 --   Stability   :  experimental
 --   Portability :  portable
 --
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE RecordWildCards       #-}
 module Network.BitTorrent.Sessions
        ( -- * Progress
          Progress(..), startProgress
diff --git a/src/Network/BitTorrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index be5c2fb8..e1e6ea71 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -9,8 +9,6 @@
 --   communication. Tracker is used to discover other peers in the
 --   network using torrent info hash.
 --
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards   #-}
 {-# LANGUAGE TemplateHaskell   #-}
 module Network.BitTorrent.Tracker
        ( withTracker, completedReq
diff --git a/src/Network/BitTorrent/Tracker/HTTP.hs b/src/Network/BitTorrent/Tracker/HTTP.hs
index fe690b96..0ada154b 100644
--- a/src/Network/BitTorrent/Tracker/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/HTTP.hs
@@ -13,7 +13,6 @@
 --   For more information see:
 --   <https://wiki.theory.org/BitTorrentSpecification#Tracker_HTTP.2FHTTPS_Protocol>
 --
-{-# LANGUAGE OverloadedStrings #-}
 module Network.BitTorrent.Tracker.HTTP
        ( askTracker, leaveTracker
        , scrapeURL
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index d1fff73c..ee395883 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -18,12 +18,10 @@
 --   scrape query -- which queries the state of a given torrent (or
 --   a list of torrents) that the tracker is managing.
 --
-{-# OPTIONS -fno-warn-orphans           #-}
-{-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE RecordWildCards            #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE FlexibleInstances          #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TemplateHaskell            #-}
+{-# OPTIONS -fno-warn-orphans           #-}
 module Network.BitTorrent.Tracker.Protocol
        ( Event(..), AnnounceQuery(..), AnnounceInfo(..)
        , defaultNumWant , defaultPorts