diff --git a/streaming/StreamEventHandler.java b/streaming/stream_event_handler.hh
similarity index 75%
rename from streaming/StreamEventHandler.java
rename to streaming/stream_event_handler.hh
index e2e84bbff6..746de2834f 100644
--- a/streaming/StreamEventHandler.java
+++ b/streaming/stream_event_handler.hh
@@ -14,18 +14,25 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
+ * Modified by Cloudius Systems.
+ * Copyright 2015 Cloudius Systems.
  */
-package org.apache.cassandra.streaming;
 
-import com.google.common.util.concurrent.FutureCallback;
+#pragma once
 
-public interface StreamEventHandler extends FutureCallback<StreamState>
-{
+#include "streaming/stream_event.hh"
+
+namespace streaming {
+
+class stream_event_handler /* extends FutureCallback<StreamState> */ {
     /**
      * Callback for various streaming events.
      *
      * @see StreamEvent.Type
      * @param event Stream event.
      */
-    void handleStreamEvent(StreamEvent event);
-}
+    virtual void handle_stream_event(stream_event event) = 0;
+};
+
+} // namespace streaming
diff --git a/streaming/streaming.cc b/streaming/streaming.cc
index 459a764fe6..b9c1cbcae4 100644
--- a/streaming/streaming.cc
+++ b/streaming/streaming.cc
@@ -18,3 +18,4 @@
 #include "streaming/stream_session.hh"
 #include "streaming/stream_task.hh"
 #include "streaming/stream_event.hh"
+#include "streaming/stream_event_handler.hh"