From a9972b4b28eb93b841944abeef4766224c19d41c Mon Sep 17 00:00:00 2001
From: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Date: Thu, 23 Apr 2015 09:51:52 +0200
Subject: [PATCH] Relax header dependencies

---
 cql3/operation.hh                   | 2 +-
 cql3/statements/delete_statement.hh | 2 +-
 cql3/statements/update_statement.hh | 2 +-
 db/legacy_schema_tables.cc          | 1 -
 db/legacy_schema_tables.hh          | 2 +-
 db/serializer.cc                    | 1 +
 db/serializer.hh                    | 3 ++-
 db/system_keyspace.hh               | 1 -
 tests/urchin/serializer_test.cc     | 1 +
 thrift/thrift_validation.hh         | 3 ++-
 utils/murmur_hash.hh                | 2 +-
 validation.cc                       | 1 +
 validation.hh                       | 4 +++-
 13 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cql3/operation.hh b/cql3/operation.hh
index bb0c859112..a632d46f5e 100644
--- a/cql3/operation.hh
+++ b/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>
diff --git a/cql3/statements/delete_statement.hh b/cql3/statements/delete_statement.hh
index 2558d67711..f3cc4cac9c 100644
--- a/cql3/statements/delete_statement.hh
+++ b/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 {
 
diff --git a/cql3/statements/update_statement.hh b/cql3/statements/update_statement.hh
index fb03aeecb0..d749284c1f 100644
--- a/cql3/statements/update_statement.hh
+++ b/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"
diff --git a/db/legacy_schema_tables.cc b/db/legacy_schema_tables.cc
index d0c5b41c31..a1c65f5d76 100644
--- a/db/legacy_schema_tables.cc
+++ b/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;
 
diff --git a/db/legacy_schema_tables.hh b/db/legacy_schema_tables.hh
index 59a7bc6f77..38f52ff468 100644
--- a/db/legacy_schema_tables.hh
+++ b/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>
diff --git a/db/serializer.cc b/db/serializer.cc
index 57e7bd6177..d70c4516bc 100644
--- a/db/serializer.cc
+++ b/db/serializer.cc
@@ -3,6 +3,7 @@
  */
 
 #include "serializer.hh"
+#include "database.hh"
 #include "types.hh"
 #include "util/serialization.hh"
 
diff --git a/db/serializer.hh b/db/serializer.hh
index 841c98f21f..e853c887c9 100644
--- a/db/serializer.hh
+++ b/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 {
 /**
diff --git a/db/system_keyspace.hh b/db/system_keyspace.hh
index c7fa6be4de..ffe5b4c67a 100644
--- a/db/system_keyspace.hh
+++ b/db/system_keyspace.hh
@@ -24,7 +24,6 @@
 #pragma once
 
 #include "schema.hh"
-#include "database.hh"
 #include "legacy_schema_tables.hh"
 
 namespace db {
diff --git a/tests/urchin/serializer_test.cc b/tests/urchin/serializer_test.cc
index aa3609f2a4..068d1d0ffa 100644
--- a/tests/urchin/serializer_test.cc
+++ b/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;
 
diff --git a/thrift/thrift_validation.hh b/thrift/thrift_validation.hh
index b1bb3b511a..a228630a5c 100644
--- a/thrift/thrift_validation.hh
+++ b/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;
diff --git a/utils/murmur_hash.hh b/utils/murmur_hash.hh
index 28b73fd96d..ecdc38283c 100644
--- a/utils/murmur_hash.hh
+++ b/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
diff --git a/validation.cc b/validation.cc
index 2ddfda148c..21a45a0be4 100644
--- a/validation.cc
+++ b/validation.cc
@@ -23,6 +23,7 @@
  */
 
 #include "validation.hh"
+#include "database.hh"
 #include "exceptions/exceptions.hh"
 
 namespace validation {
diff --git a/validation.hh b/validation.hh
index d301113eb4..20c317831e 100644
--- a/validation.hh
+++ b/validation.hh
@@ -24,7 +24,9 @@
 
 #pragma once
 
-#include "database.hh"
+#include "database_fwd.hh"
+#include "schema.hh"
+#include "core/sstring.hh"
 
 namespace validation {