diff --git a/db/db.cc b/db/db.cc
index 123f7a3624..7d3ad53499 100644
--- a/db/db.cc
+++ b/db/db.cc
@@ -15,6 +15,7 @@
 #include "composites/cell_name_type.hh"
 #include "cell.hh"
 #include "counter_update_cell.hh"
+#include "deleted_cell.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/DeletedCell.java b/db/deleted_cell.hh
similarity index 63%
rename from db/DeletedCell.java
rename to db/deleted_cell.hh
index 998c4097af..35bff03621 100644
--- a/db/DeletedCell.java
+++ b/db/deleted_cell.hh
@@ -15,16 +15,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cassandra.db;
 
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.utils.concurrent.OpOrder;
-import org.apache.cassandra.utils.memory.AbstractAllocator;
-import org.apache.cassandra.utils.memory.MemtableAllocator;
+/*
+ * Modified by Cloudius Systems
+ * Copyright 2015 Cloudius Systems
+ */
 
-public interface DeletedCell extends Cell
-{
-    DeletedCell localCopy(CFMetaData metadata, AbstractAllocator allocator);
+#pragma once
+
+#include "cell.hh"
+
+namespace db {
+
+class deleted_cell : public cell {
+public:
+    // Note: The origin returns deleted_cell instead cell
+    virtual std::shared_ptr<cell> local_copy(CFMetaData metadata, AbstractAllocator allocator) = 0;
+    virtual std::shared_ptr<cell> local_copy(CFMetaData metaData, MemtableAllocator allocator, OpOrder::Group op_group) = 0;
+};
 
-    DeletedCell localCopy(CFMetaData metaData, MemtableAllocator allocator, OpOrder.Group opGroup);
 }