diff --git a/streaming/stream_plan.cc b/streaming/stream_plan.cc
index a73803d9b4..11b3218ecc 100644
--- a/streaming/stream_plan.cc
+++ b/streaming/stream_plan.cc
@@ -52,4 +52,9 @@ stream_plan& stream_plan::transfer_files(inet_address to, std::vector<stream_ses
     return *this;
 }
 
+stream_plan& stream_plan::flush_before_transfer(bool flush_before_transfer_) {
+    _flush_before_transfer = flush_before_transfer_;
+    return *this;
+}
+
 }
diff --git a/streaming/stream_plan.hh b/streaming/stream_plan.hh
index e5e246c8ff..9ae89b8e1c 100644
--- a/streaming/stream_plan.hh
+++ b/streaming/stream_plan.hh
@@ -175,6 +175,7 @@ public:
     {
         return StreamResultFuture.init(planId, description, handlers, coordinator);
     }
+#endif
 
     /**
      * Set flushBeforeTransfer option.
@@ -183,12 +184,7 @@ public:
      * @param flushBeforeTransfer set to true when the node should flush before transfer
      * @return this object for chaining
      */
-    public StreamPlan flushBeforeTransfer(boolean flushBeforeTransfer)
-    {
-        this.flushBeforeTransfer = flushBeforeTransfer;
-        return this;
-    }
-#endif
+    stream_plan& flush_before_transfer(bool flush_before_transfer_);
 };
 
 } // namespace streaming