diff --git a/source/Network/Xmpp/Internal.hs b/source/Network/Xmpp/Internal.hs
index 47da87d..1e961e7 100644
--- a/source/Network/Xmpp/Internal.hs
+++ b/source/Network/Xmpp/Internal.hs
@@ -28,6 +28,10 @@ module Network.Xmpp.Internal
   , auth
   , pushStanza
   , pullStanza
+  , pushIQ'
+  , pickleElem
+  , unpickleElem
+  , xpLangTag
  )
 
        where
@@ -37,3 +41,4 @@ import Network.Xmpp.Sasl
 import Network.Xmpp.Tls
 import Network.Xmpp.Types
 import Network.Xmpp.Stream
+import Network.Xmpp.Marshal
diff --git a/source/Network/Xmpp/Xep/InbandRegistration.hs b/source/Network/Xmpp/Xep/InbandRegistration.hs
index c8ceeb6..e970310 100644
--- a/source/Network/Xmpp/Xep/InbandRegistration.hs
+++ b/source/Network/Xmpp/Xep/InbandRegistration.hs
@@ -19,9 +19,7 @@ import qualified Data.Text as Text
 import           Data.XML.Pickle
 import qualified Data.XML.Types as XML
 
-import           Network.Xmpp.Stream
-import           Network.Xmpp.Pickle
-import           Network.Xmpp.Types
+import           Network.Xmpp.Internal
 import           Network.Xmpp.Xep.ServiceDiscovery
 
 
diff --git a/source/Network/Xmpp/Xep/ServiceDiscovery.hs b/source/Network/Xmpp/Xep/ServiceDiscovery.hs
index 01be720..298f420 100644
--- a/source/Network/Xmpp/Xep/ServiceDiscovery.hs
+++ b/source/Network/Xmpp/Xep/ServiceDiscovery.hs
@@ -25,11 +25,7 @@ import           Data.XML.Pickle
 import           Data.XML.Types
 
 import           Network.Xmpp
-import           Network.Xmpp.Concurrent
-import           Network.Xmpp.Concurrent.Types
-import           Network.Xmpp.Stream
-import           Network.Xmpp.Marshal
-import           Network.Xmpp.Types
+import           Network.Xmpp.Internal
 import           Control.Concurrent.STM.TMVar
 
 data DiscoError = DiscoNoQueryElement