diff --git a/src/Streamly/Internal/Data/Stream/IsStream.hs b/src/Streamly/Internal/Data/Stream/IsStream.hs
index 057d7c37d..c1efe99d2 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream.hs
@@ -22,6 +22,9 @@ module Streamly.Internal.Data.Stream.IsStream  {-# DEPRECATED "Please use \"Stre
     , module Streamly.Internal.Data.Stream.IsStream.Exception
     , module Streamly.Internal.Data.Stream.IsStream.Lift
     , module Streamly.Internal.Data.Stream.IsStream.Top
+    , module Streamly.Internal.Data.Stream.IsStream.Combinators
+    , module Streamly.Internal.Data.Stream.IsStream.Common
+    , module Streamly.Internal.Data.Stream.IsStream.Enumeration
     , fromStream
     , toStream
     )
@@ -38,6 +41,9 @@ import Streamly.Internal.Data.Stream.IsStream.Transform
 import Streamly.Internal.Data.Stream.IsStream.Type
     hiding (cmpBy, drain, eqBy, foldl', fold, toList, toStream
         , fromEffect, fromPure, repeat, fromStream)
+import Streamly.Internal.Data.Stream.IsStream.Combinators
+import Streamly.Internal.Data.Stream.IsStream.Common
+import Streamly.Internal.Data.Stream.IsStream.Enumeration
 
 import qualified Streamly.Internal.Data.Stream as D
 
diff --git a/streamly.cabal b/streamly.cabal
index f003ad0ef..00b5242fb 100644
--- a/streamly.cabal
+++ b/streamly.cabal
@@ -423,9 +423,6 @@ library
                      , Streamly.Internal.Data.Stream.ZipAsync
 
                      , Streamly.Internal.Data.Stream.IsStream
-                     , Streamly.Internal.Data.Stream.IsStream.Combinators
-                     , Streamly.Internal.Data.Stream.IsStream.Common
-                     , Streamly.Internal.Data.Stream.IsStream.Enumeration
 
     if !impl(ghcjs) && flag(dev)
         other-modules:
@@ -477,6 +474,9 @@ library
          , Streamly.Internal.Data.Stream.IsStream.Exception
          , Streamly.Internal.Data.Stream.IsStream.Lift
          , Streamly.Internal.Data.Stream.IsStream.Top
+         , Streamly.Internal.Data.Stream.IsStream.Combinators
+         , Streamly.Internal.Data.Stream.IsStream.Common
+         , Streamly.Internal.Data.Stream.IsStream.Enumeration
 
          , Streamly.Internal.Data.Stream.SVar.Generate
          , Streamly.Internal.Data.Stream.SVar.Eliminate
diff --git a/test/lib/Streamly/Test/Prelude/Common.hs b/test/lib/Streamly/Test/Prelude/Common.hs
index 1ee70ac8b..df3f52ea5 100644
--- a/test/lib/Streamly/Test/Prelude/Common.hs
+++ b/test/lib/Streamly/Test/Prelude/Common.hs
@@ -138,7 +138,7 @@ import Streamly.Prelude (avgRate, rate, maxBuffer, maxThreads)
 import qualified Streamly.Prelude as S
 import qualified Streamly.Data.Fold as FL
 import qualified Streamly.Internal.Data.Stream.IsStream as S
-import qualified Streamly.Internal.Data.Stream.IsStream.Common as IS
+import qualified Streamly.Internal.Data.Stream.IsStream as IS
 import qualified Streamly.Internal.Data.Unfold as UF
 
 import qualified Data.Map.Strict as Map