diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 8bde922fd5..0156bfa51b 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -243,7 +243,7 @@ object AkkaBuild extends Build {
   lazy val httpCore = Project(
     id = "akka-http-core-experimental",
     base = file("akka-http-core"),
-    dependencies = Seq(parsing, streamTestkit % "test->test", stream),
+    dependencies = Seq(stream, parsing, streamTestkit % "test->test"),
     settings = defaultSettings
 //      ++ (if (GenJavaDocEnabled) Seq(
 //       // genjavadoc needs to generate synthetic methods since the java code uses them
diff --git a/project/OSGi.scala b/project/OSGi.scala
index f758bf57ed..f29b396b78 100644
--- a/project/OSGi.scala
+++ b/project/OSGi.scala
@@ -47,39 +47,28 @@ object OSGi {
   val parsing = exports(Seq("akka.parboiled2.*", "akka.shapeless.*"),
     imports = Seq(optionalResolution("scala.quasiquotes")))
 
-  val httpCore = exports(Seq("akka.http.*"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.parboiled2.*"),
-      streamAndHttpImport("akka.shapeless.*")))
+  val httpCore = exports(Seq("akka.http.*"))
 
   val http = exports(Seq("akka.http.impl.server",
     "akka.http.scaladsl.server.*", "akka.http.javadsl.server.*",
     "akka.http.scaladsl.client", "akka.http.scaladsl.coding", "akka.http.scaladsl.common",
     "akka.http.scaladsl.marshalling", "akka.http.scaladsl.unmarshalling"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.http.*"),
-      streamAndHttpImport("akka.parboiled2.*")))
+    imports = Seq(
+      streamAndHttpImport("akka.stream.*"),
+      streamAndHttpImport("akka.parboiled2.*"))
+  )
 
-  val httpTestkit = exports(Seq("akka.http.scaladsl.testkit.*", "akka.http.javadsl.testkit.*"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.http.*")))
+  val httpTestkit = exports(Seq("akka.http.scaladsl.testkit.*", "akka.http.javadsl.testkit.*"))
 
-  val httpSprayJson = exports(Seq("akka.http.scaladsl.marshallers.sprayjson"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.http.*")))
+  val httpSprayJson = exports(Seq("akka.http.scaladsl.marshallers.sprayjson"))
 
-  val httpXml = exports(Seq("akka.http.scaladsl.marshallers.xml"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.http.*")))
+  val httpXml = exports(Seq("akka.http.scaladsl.marshallers.xml"))
 
-  val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"),
-    imports = Seq(streamAndHttpImport("akka.stream.*"),
-      streamAndHttpImport("akka.http.*")))
+  val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"))
 
   val stream = exports(Seq("akka.stream.*"))
 
-  val streamTestkit = exports(Seq("akka.stream.testkit.*"),
-    imports = Seq(streamAndHttpImport("akka.stream.*")))
+  val streamTestkit = exports(Seq("akka.stream.testkit.*"))
 
   val slf4j = exports(Seq("akka.event.slf4j.*"))