From cd668061fc19b49eba904ebbc706bcf6d06d36b3 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Sun, 11 Mar 2018 18:53:49 +0200
Subject: [PATCH] storage_service: remove system_keyspace.hh include

Re-distribute include among the files that really need it.
---
 message/messaging_service.cc | 1 +
 service/storage_proxy.cc     | 1 +
 service/storage_service.hh   | 1 -
 tests/cql_test_env.cc        | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/message/messaging_service.cc b/message/messaging_service.cc
index e1a556eead..e6febb09bb 100644
--- a/message/messaging_service.cc
+++ b/message/messaging_service.cc
@@ -33,6 +33,7 @@
 #include "query-result.hh"
 #include "rpc/rpc.hh"
 #include "db/config.hh"
+#include "db/system_keyspace.hh"
 #include "dht/i_partitioner.hh"
 #include "range.hh"
 #include "frozen_schema.hh"
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index a12c9eb53f..7e2f22374b 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -57,6 +57,7 @@
 #include "db/config.hh"
 #include "db/batchlog_manager.hh"
 #include "db/hints/manager.hh"
+#include "db/system_keyspace.hh"
 #include "exceptions/exceptions.hh"
 #include <boost/range/algorithm_ext/push_back.hpp>
 #include <boost/iterator/counting_iterator.hpp>
diff --git a/service/storage_service.hh b/service/storage_service.hh
index 0464d5ca51..9de5a7b7fa 100644
--- a/service/storage_service.hh
+++ b/service/storage_service.hh
@@ -51,7 +51,6 @@
 #include "dht/token_range_endpoints.hh"
 #include "core/sleep.hh"
 #include "gms/application_state.hh"
-#include "db/system_keyspace.hh"
 #include "core/semaphore.hh"
 #include "utils/fb_utilities.hh"
 #include "utils/serialized_action.hh"
diff --git a/tests/cql_test_env.cc b/tests/cql_test_env.cc
index 63a7de2289..779a2bab4c 100644
--- a/tests/cql_test_env.cc
+++ b/tests/cql_test_env.cc
@@ -44,6 +44,7 @@
 #include "gms/gossiper.hh"
 #include "service/storage_service.hh"
 #include "auth/service.hh"
+#include "db/system_keyspace.hh"
 
 namespace sstables {