Relax header dependencies

cql3/operation.hh

@@ -27,7 +27,7 @@
 
 #include "core/shared_ptr.hh"
 #include "exceptions/exceptions.hh"
-#include "database.hh"
+#include "database_fwd.hh"
 #include "term.hh"
 
 #include <experimental/optional>

cql3/statements/delete_statement.hh

@@ -27,7 +27,7 @@
 #include "cql3/statements/modification_statement.hh"
 #include "cql3/attributes.hh"
 #include "cql3/operation.hh"
-#include "database.hh"
+#include "database_fwd.hh"
 
 namespace cql3 {
 

cql3/statements/update_statement.hh

@@ -29,7 +29,7 @@
 #include "cql3/column_identifier.hh"
 #include "cql3/term.hh"
 
-#include "database.hh"
+#include "database_fwd.hh"
 
 #include <vector>
 #include "unimplemented.hh"

db/legacy_schema_tables.cc

@@ -24,7 +24,6 @@
 #include "utils/UUID_gen.hh"
 #include "legacy_schema_tables.hh"
 #include "system_keyspace.hh"
-#include "database.hh"
 
 using namespace db::system_keyspace;
 

db/legacy_schema_tables.hh

@@ -25,7 +25,7 @@
 
 #include "service/storage_proxy.hh"
 #include "config/ks_meta_data.hh"
-#include "database.hh"
+#include "mutation.hh"
 #include "schema.hh"
 
 #include <vector>

db/serializer.cc

@@ -3,6 +3,7 @@
  */
 
 #include "serializer.hh"
+#include "database.hh"
 #include "types.hh"
 #include "util/serialization.hh"
 

db/serializer.hh

@@ -8,7 +8,8 @@
 #include "utils/data_input.hh"
 #include "utils/data_output.hh"
 #include "bytes.hh"
-#include "database.hh"
+#include "mutation.hh"
+#include "database_fwd.hh"
 
 namespace db {
 /**

db/system_keyspace.hh

@@ -24,7 +24,6 @@
 #pragma once
 
 #include "schema.hh"
-#include "database.hh"
 #include "legacy_schema_tables.hh"
 
 namespace db {

tests/urchin/serializer_test.cc

@@ -13,6 +13,7 @@
 #include "core/future-util.hh"
 #include "utils/UUID_gen.hh"
 #include "db/serializer.hh"
+#include "database.hh"
 
 using namespace db;
 

thrift/thrift_validation.hh

@@ -24,7 +24,8 @@
 
 #pragma once
 
-#include "database.hh"
+#include "schema.hh"
+#include "bytes.hh"
 
 #if 0
 import java.nio.ByteBuffer;

utils/murmur_hash.hh

@@ -24,7 +24,7 @@
 #include <cstdint>
 #include <array>
 
-#include "database.hh"
+#include "bytes.hh"
 
 /**
  * This is a very fast, non-cryptographic hash suitable for general hash-based

validation.cc

@@ -23,6 +23,7 @@
  */
 
 #include "validation.hh"
+#include "database.hh"
 #include "exceptions/exceptions.hh"
 
 namespace validation {

validation.hh

@@ -24,7 +24,9 @@
 
 #pragma once
 
-#include "database.hh"
+#include "database_fwd.hh"
+#include "schema.hh"
+#include "core/sstring.hh"
 
 namespace validation {