diff --git a/source/Network/Xmpp.hs b/source/Network/Xmpp.hs
index bc8281b..45524e2 100644
--- a/source/Network/Xmpp.hs
+++ b/source/Network/Xmpp.hs
@@ -151,6 +151,7 @@ module Network.Xmpp
   , StanzaError(..)
   , StanzaErrorType(..)
   , StanzaErrorCondition(..)
+  , SaslFailure(..)
   -- * Threads
   , dupSession
   -- * Miscellaneous
@@ -162,6 +163,7 @@ module Network.Xmpp
                , AuthSaslFailure
                , AuthIllegalCredentials
                , AuthOtherFailure )
+  , SaslHandler(..)
   ) where
 
 import Network.Xmpp.Concurrent
diff --git a/source/Network/Xmpp/IM.hs b/source/Network/Xmpp/IM.hs
index 2f5bf08..38730e9 100644
--- a/source/Network/Xmpp/IM.hs
+++ b/source/Network/Xmpp/IM.hs
@@ -5,6 +5,8 @@ module Network.Xmpp.IM
     MessageBody(..)
   , MessageThread(..)
   , MessageSubject(..)
+  , InstantMessage (..)
+  , Subscription(..)
   , instantMessage
   , getIM
   , withIM
diff --git a/source/Network/Xmpp/Internal.hs b/source/Network/Xmpp/Internal.hs
index c06d06e..8e4ec66 100644
--- a/source/Network/Xmpp/Internal.hs
+++ b/source/Network/Xmpp/Internal.hs
@@ -31,6 +31,9 @@ module Network.Xmpp.Internal
   , pushIQ
   , SaslHandler
   , StanzaID(..)
+  , ConnectionState(..)
+  , Stanza(..)
+  , TlsBehaviour(..)
  )
 
        where