diff --git a/cql3/statements/ks_prop_defs.cc b/cql3/statements/ks_prop_defs.cc
index 5c62fdaf33..69e1c693c6 100644
--- a/cql3/statements/ks_prop_defs.cc
+++ b/cql3/statements/ks_prop_defs.cc
@@ -40,6 +40,7 @@
  */
 
 #include "cql3/statements/ks_prop_defs.hh"
+#include "database.hh"
 
 namespace cql3 {
 
diff --git a/cql3/statements/ks_prop_defs.hh b/cql3/statements/ks_prop_defs.hh
index f7df831ad5..7a08ef8f0f 100644
--- a/cql3/statements/ks_prop_defs.hh
+++ b/cql3/statements/ks_prop_defs.hh
@@ -43,12 +43,12 @@
 
 #include "cql3/statements/property_definitions.hh"
 
-#include "database.hh"
-
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/sstring.hh>
 #include <experimental/optional>
 
+class keyspace_metadata;
+
 namespace cql3 {
 
 namespace statements {