diff --git a/cql3/cql3.cc b/cql3/cql3.cc
index 61e21890a3..fcdd6b0a6f 100644
--- a/cql3/cql3.cc
+++ b/cql3/cql3.cc
@@ -20,6 +20,7 @@
 #include "statements/cf_statement.hh"
 #include "statements/use_statement.hh"
 #include "statements/parsed_statement.hh"
+#include "statements/property_definitions.hh"
 #include "statements/truncate_statement.hh"
 #include "statements/schema_altering_statement.hh"
 #include "cql_statement.hh"
diff --git a/cql3/statements/PropertyDefinitions.java b/cql3/statements/property_definitions.hh
similarity index 94%
rename from cql3/statements/PropertyDefinitions.java
rename to cql3/statements/property_definitions.hh
index 793285bbdb..583e62accc 100644
--- a/cql3/statements/PropertyDefinitions.java
+++ b/cql3/statements/property_definitions.hh
@@ -15,6 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * Copyright 2015 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+
+#ifndef CQL3_STATEMENTS_PROPERTY_DEFINITIONS_HH
+#define CQL3_STATEMENTS_PROPERTY_DEFINITIONS_HH
+
+namespace cql3 {
+
+namespace statements {
+
+#if 0
 package org.apache.cassandra.cql3.statements;
 
 import java.util.*;
@@ -23,9 +38,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.exceptions.SyntaxException;
+#endif
 
-public class PropertyDefinitions
-{
+class property_definitions {
+#if 0
     protected static final Logger logger = LoggerFactory.getLogger(PropertyDefinitions.class);
 
     protected final Map<String, Object> properties = new HashMap<String, Object>();
@@ -140,4 +156,11 @@ public class PropertyDefinitions
             }
         }
     }
+#endif
+};
+
 }
+
+}
+
+#endif