diff --git a/db/db.cc b/db/db.cc
index ab6d0c61b4..ccdde6c90c 100644
--- a/db/db.cc
+++ b/db/db.cc
@@ -18,6 +18,7 @@
 #include "deleted_cell.hh"
 #include "expiring_cell.hh"
 #include "counter_cell.hh"
+#include "i_mutation.hh"
 
 const db::composites::composite::EOC db::composites::composite::EOC::START{-1};
 const db::composites::composite::EOC db::composites::composite::EOC::NONE{-1};
diff --git a/db/IMutation.java b/db/i_mutation.hh
similarity index 58%
rename from db/IMutation.java
rename to db/i_mutation.hh
index 44df104c20..b3be484b4f 100644
--- a/db/IMutation.java
+++ b/db/i_mutation.hh
@@ -15,19 +15,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cassandra.db;
 
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.UUID;
+/*
+ * Modified by Cloudius Systems
+ * Copyright 2015 Cloudius Systems
+ */
+
+#pragma once
+
+#include "core/sstring.hh"
+
+namespace db {
+
+// FIXME: real UUID and ColumnFamily
+class UUID;
+class ColumnFamily;
+
+class i_mutation {
+public:
+    virtual sstring get_keyspace_name() =0;
+    virtual std::vector<UUID> get_column_family_ids() = 0;
+    virtual bytes key() = 0;
+    virtual int64_t get_timeout() = 0;
+    virtual sstring to_string(bool shallow) = 0;
+    virtual void add_all(i_mutation& m) = 0;
+    virtual std::vector<ColumnFamily> get_column_families() = 0;
+};
 
-public interface IMutation
-{
-    public String getKeyspaceName();
-    public Collection<UUID> getColumnFamilyIds();
-    public ByteBuffer key();
-    public long getTimeout();
-    public String toString(boolean shallow);
-    public void addAll(IMutation m);
-    public Collection<ColumnFamily> getColumnFamilies();
 }