diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
index 54f6e147c3..981b05a7df 100644
--- a/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
+++ b/akka-stream/src/main/scala/akka/stream/javadsl/Duct.scala
@@ -11,6 +11,8 @@ import org.reactivestreams.api.Consumer
 import org.reactivestreams.api.Producer
 import akka.japi.Function
 import akka.japi.Function2
+import akka.japi.Pair
+import akka.japi.Predicate
 import akka.japi.Procedure
 import akka.japi.Util.immutableSeq
 import akka.stream.{ FlattenStrategy, FlowMaterializer, Transformer }
diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
index 69e9794696..5dc2c39479 100644
--- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
+++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
@@ -12,12 +12,13 @@ import scala.util.Success
 import org.reactivestreams.api.Producer
 import akka.japi.Function
 import akka.japi.Function2
+import akka.japi.Pair
+import akka.japi.Predicate
 import akka.japi.Procedure
 import akka.japi.Util.immutableSeq
 import akka.stream.{ FlattenStrategy, FlowMaterializer, Transformer }
 import akka.stream.scaladsl.{ Flow ⇒ SFlow }
 import org.reactivestreams.api.Consumer
-import akka.stream.impl.DuctImpl
 
 /**
  * Java API
@@ -318,19 +319,6 @@ trait OnCompleteCallback {
   def onComplete(e: Throwable)
 }
 
-/**
- * Java API: Represents a tuple of two elements.
- */
-case class Pair[A, B](first: A, second: B) // FIXME move this to akka.japi.Pair in akka-actor
-
-/**
- * Java API: Defines a criteria and determines whether the parameter meets this criteria.
- */
-trait Predicate[T] {
-  // FIXME move this to akka.japi.Predicate in akka-actor 
-  def test(param: T): Boolean
-}
-
 /**
  * INTERNAL API
  */
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java b/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
index de847acf2a..c77467dbac 100644
--- a/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
+++ b/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
@@ -25,6 +25,8 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.japi.Function;
 import akka.japi.Function2;
+import akka.japi.Pair;
+import akka.japi.Predicate;
 import akka.japi.Procedure;
 import akka.japi.Util;
 import akka.stream.FlowMaterializer;
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java b/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
index a76c4ad065..8c919133e4 100644
--- a/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
+++ b/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
@@ -26,6 +26,8 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.japi.Function;
 import akka.japi.Function2;
+import akka.japi.Pair;
+import akka.japi.Predicate;
 import akka.japi.Procedure;
 import akka.japi.Util;
 import akka.stream.FlowMaterializer;