You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2017/08/22 19:44:02 UTC
kudu git commit: [iwyu] a minor clean-up after recent merges
Repository: kudu
Updated Branches:
refs/heads/master 8f6812047 -> e1c753e58
[iwyu] a minor clean-up after recent merges
After recent updates, some file became not compliant with IWYU.
This patch fixes that to have the IWYU in the clean state since
the IWYU configuration is already enabled for gerrit pre-commit
verification.
I also sneaked in a few other updates on other files to remove them
from the 'muted' list in build-support/iwyu/iwyu-filter.awk
Change-Id: I052056efc32b5173c51cd3f0f939e19e604a7091
Reviewed-on: http://gerrit.cloudera.org:8080/7773
Tested-by: Alexey Serbin <as...@cloudera.com>
Reviewed-by: Todd Lipcon <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/e1c753e5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/e1c753e5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/e1c753e5
Branch: refs/heads/master
Commit: e1c753e58f52afafa6fc86c7640eec1490cf97a7
Parents: 8f68120
Author: Alexey Serbin <as...@cloudera.com>
Authored: Tue Aug 22 09:44:39 2017 -0700
Committer: Alexey Serbin <as...@cloudera.com>
Committed: Tue Aug 22 19:41:07 2017 +0000
----------------------------------------------------------------------
build-support/iwyu/iwyu-filter.awk | 6 ------
src/kudu/client/master_rpc.cc | 1 +
src/kudu/client/master_rpc.h | 2 +-
src/kudu/consensus/log.cc | 1 -
src/kudu/consensus/mt-log-test.cc | 1 -
src/kudu/consensus/raft_consensus.h | 1 -
src/kudu/integration-tests/create-table-stress-test.cc | 1 +
.../external_mini_cluster-itest-base.h | 7 -------
.../external_mini_cluster_fs_inspector.cc | 5 +----
.../internal_mini_cluster-itest-base.h | 9 +++++----
src/kudu/integration-tests/internal_mini_cluster.cc | 1 +
src/kudu/integration-tests/internal_mini_cluster.h | 3 +++
src/kudu/integration-tests/log_verifier.cc | 3 ++-
.../integration-tests/master_cert_authority-itest.cc | 1 +
src/kudu/integration-tests/master_replication-itest.cc | 3 ++-
src/kudu/integration-tests/table_locations-itest.cc | 1 +
src/kudu/integration-tests/tablet_copy-itest.cc | 1 +
src/kudu/integration-tests/ts_tablet_manager-itest.cc | 1 +
src/kudu/master/sys_catalog-test.cc | 1 +
src/kudu/rpc/connection.h | 2 +-
src/kudu/tablet/memrowset.h | 1 +
src/kudu/tablet/tablet_metadata.h | 12 ++++++------
src/kudu/tablet/tablet_replica-test.cc | 1 +
src/kudu/tools/ksck.cc | 1 +
src/kudu/tools/kudu-tool-test.cc | 2 ++
src/kudu/tserver/tablet_copy_source_session.cc | 2 ++
src/kudu/tserver/tablet_server_test_util.cc | 3 +--
src/kudu/tserver/tablet_service.cc | 1 +
src/kudu/util/net/sockaddr.cc | 1 -
29 files changed, 38 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/build-support/iwyu/iwyu-filter.awk
----------------------------------------------------------------------
diff --git a/build-support/iwyu/iwyu-filter.awk b/build-support/iwyu/iwyu-filter.awk
index e442113..b68dbb4 100644
--- a/build-support/iwyu/iwyu-filter.awk
+++ b/build-support/iwyu/iwyu-filter.awk
@@ -92,11 +92,6 @@ BEGIN {
muted["kudu/fs/fs_manager-test.cc"]
muted["kudu/fs/log_block_manager-test.cc"]
muted["kudu/gutil/atomicops-internals-x86.cc"]
- muted["kudu/integration-tests/external_mini_cluster-itest-base.h"]
- muted["kudu/integration-tests/external_mini_cluster_fs_inspector.cc"]
- muted["kudu/integration-tests/internal_mini_cluster-itest-base.h"]
- muted["kudu/integration-tests/internal_mini_cluster.h"]
- muted["kudu/integration-tests/log_verifier.cc"]
muted["kudu/integration-tests/token_signer-itest.cc"]
muted["kudu/rpc/negotiation-test.cc"]
muted["kudu/rpc/negotiation.cc"]
@@ -125,7 +120,6 @@ BEGIN {
muted["kudu/server/webserver.cc"]
muted["kudu/tablet/all_types-scan-correctness-test.cc"]
muted["kudu/tablet/diskrowset.cc"]
- muted["kudu/tablet/memrowset.h"]
muted["kudu/tablet/mt-rowset_delta_compaction-test.cc"]
muted["kudu/tablet/mt-tablet-test.cc"]
muted["kudu/tablet/tablet.cc"]
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/client/master_rpc.cc
----------------------------------------------------------------------
diff --git a/src/kudu/client/master_rpc.cc b/src/kudu/client/master_rpc.cc
index 6828394..dcdc9a5 100644
--- a/src/kudu/client/master_rpc.cc
+++ b/src/kudu/client/master_rpc.cc
@@ -37,6 +37,7 @@
#include "kudu/master/master.proxy.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/rpc/rpc_header.pb.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
#include "kudu/util/status_callback.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/client/master_rpc.h
----------------------------------------------------------------------
diff --git a/src/kudu/client/master_rpc.h b/src/kudu/client/master_rpc.h
index c951aa0..efa1075 100644
--- a/src/kudu/client/master_rpc.h
+++ b/src/kudu/client/master_rpc.h
@@ -31,10 +31,10 @@
#include "kudu/rpc/rpc_controller.h"
#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
-#include "kudu/util/net/sockaddr.h"
namespace kudu {
+class Sockaddr;
class Status;
namespace rpc {
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/consensus/log.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/log.cc b/src/kudu/consensus/log.cc
index 7100630..cc99abb 100644
--- a/src/kudu/consensus/log.cc
+++ b/src/kudu/consensus/log.cc
@@ -32,7 +32,6 @@
#include "kudu/consensus/log_metrics.h"
#include "kudu/consensus/log_reader.h"
#include "kudu/consensus/log_util.h"
-#include "kudu/consensus/opid_util.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/atomicops.h"
#include "kudu/gutil/bind.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/consensus/mt-log-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/mt-log-test.cc b/src/kudu/consensus/mt-log-test.cc
index 6f4ea43..fb142cd 100644
--- a/src/kudu/consensus/mt-log-test.cc
+++ b/src/kudu/consensus/mt-log-test.cc
@@ -43,7 +43,6 @@
#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/ref_counted_replicate.h"
#include "kudu/gutil/bind.h"
-#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/consensus/raft_consensus.h
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/raft_consensus.h b/src/kudu/consensus/raft_consensus.h
index 5d761e0..e80b8b0 100644
--- a/src/kudu/consensus/raft_consensus.h
+++ b/src/kudu/consensus/raft_consensus.h
@@ -71,7 +71,6 @@ class Callback;
namespace consensus {
-class ConsensusMetadata;
class ConsensusMetadataManager;
class ConsensusRound;
class PeerProxyFactory;
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/create-table-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/create-table-stress-test.cc b/src/kudu/integration-tests/create-table-stress-test.cc
index 04c1199..4f23985 100644
--- a/src/kudu/integration-tests/create-table-stress-test.cc
+++ b/src/kudu/integration-tests/create-table-stress-test.cc
@@ -51,6 +51,7 @@
#include "kudu/util/atomic.h"
#include "kudu/util/cow_object.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/stopwatch.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/external_mini_cluster-itest-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/external_mini_cluster-itest-base.h b/src/kudu/integration-tests/external_mini_cluster-itest-base.h
index 20123f7..9032c1a 100644
--- a/src/kudu/integration-tests/external_mini_cluster-itest-base.h
+++ b/src/kudu/integration-tests/external_mini_cluster-itest-base.h
@@ -22,16 +22,9 @@
#include <unordered_map>
#include <vector>
-#include <gtest/gtest.h>
-
-#include "kudu/client/client.h"
#include "kudu/client/shared_ptr.h"
-#include "kudu/gutil/stl_util.h"
-#include "kudu/integration-tests/cluster_itest_util.h"
#include "kudu/integration-tests/external_mini_cluster.h"
#include "kudu/integration-tests/external_mini_cluster_fs_inspector.h"
-#include "kudu/util/pstack_watcher.h"
-#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
index 618a3dd..9d12343 100644
--- a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
+++ b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
@@ -17,11 +17,7 @@
#include "kudu/integration-tests/external_mini_cluster_fs_inspector.h"
-#include <sys/stat.h>
-
#include <algorithm>
-#include <ctime>
-#include <ostream>
#include <set>
#include <glog/logging.h>
@@ -34,6 +30,7 @@
#include "kudu/integration-tests/external_mini_cluster.h"
#include "kudu/util/env.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster-itest-base.h b/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
index 7085369..4d189c4 100644
--- a/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
+++ b/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
@@ -21,15 +21,16 @@
#include <string>
#include <unordered_map>
-#include <gtest/gtest.h>
-
-#include "kudu/client/client.h"
+#include "kudu/client/shared_ptr.h"
#include "kudu/integration-tests/internal_mini_cluster.h"
-#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
namespace kudu {
+namespace client {
+class KuduClient;
+}
+
namespace itest {
struct TServerDetails;
}
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/internal_mini_cluster.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster.cc b/src/kudu/integration-tests/internal_mini_cluster.cc
index 5fbc9c3..713c17d 100644
--- a/src/kudu/integration-tests/internal_mini_cluster.cc
+++ b/src/kudu/integration-tests/internal_mini_cluster.cc
@@ -40,6 +40,7 @@
#include "kudu/util/make_shared.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/path_util.h"
#include "kudu/util/status.h"
#include "kudu/util/stopwatch.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/internal_mini_cluster.h
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster.h b/src/kudu/integration-tests/internal_mini_cluster.h
index 28d137b..9081479 100644
--- a/src/kudu/integration-tests/internal_mini_cluster.h
+++ b/src/kudu/integration-tests/internal_mini_cluster.h
@@ -17,6 +17,7 @@
#pragma once
+#include <cstdint>
#include <memory>
#include <string>
#include <vector>
@@ -31,6 +32,8 @@ namespace kudu {
class Env;
class HostPort;
+class Status;
+
namespace client {
class KuduClient;
class KuduClientBuilder;
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/log_verifier.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/log_verifier.cc b/src/kudu/integration-tests/log_verifier.cc
index 47e9c51..3c8b7c9 100644
--- a/src/kudu/integration-tests/log_verifier.cc
+++ b/src/kudu/integration-tests/log_verifier.cc
@@ -18,6 +18,7 @@
#include "kudu/integration-tests/log_verifier.h"
#include <cstdint>
+#include <iterator>
#include <map>
#include <memory>
#include <ostream>
@@ -26,7 +27,7 @@
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
#include <glog/logging.h>
#include "kudu/consensus/consensus.pb.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/master_cert_authority-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/master_cert_authority-itest.cc b/src/kudu/integration-tests/master_cert_authority-itest.cc
index 0e55b49..e8239c2 100644
--- a/src/kudu/integration-tests/master_cert_authority-itest.cc
+++ b/src/kudu/integration-tests/master_cert_authority-itest.cc
@@ -38,6 +38,7 @@
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
#include "kudu/security/openssl_util.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/master_replication-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/master_replication-itest.cc b/src/kudu/integration-tests/master_replication-itest.cc
index b7bdde2..e58fe25 100644
--- a/src/kudu/integration-tests/master_replication-itest.cc
+++ b/src/kudu/integration-tests/master_replication-itest.cc
@@ -41,8 +41,9 @@
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/util/monotime.h"
-#include "kudu/util/pb_util.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/table_locations-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/table_locations-itest.cc b/src/kudu/integration-tests/table_locations-itest.cc
index f956318..ddbef72 100644
--- a/src/kudu/integration-tests/table_locations-itest.cc
+++ b/src/kudu/integration-tests/table_locations-itest.cc
@@ -35,6 +35,7 @@
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/tablet_copy-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/tablet_copy-itest.cc b/src/kudu/integration-tests/tablet_copy-itest.cc
index 0e0977d..24aa1c6 100644
--- a/src/kudu/integration-tests/tablet_copy-itest.cc
+++ b/src/kudu/integration-tests/tablet_copy-itest.cc
@@ -42,6 +42,7 @@
#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/basictypes.h"
#include "kudu/gutil/gscoped_ptr.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/integration-tests/ts_tablet_manager-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/ts_tablet_manager-itest.cc b/src/kudu/integration-tests/ts_tablet_manager-itest.cc
index 5d8354d..58d2342 100644
--- a/src/kudu/integration-tests/ts_tablet_manager-itest.cc
+++ b/src/kudu/integration-tests/ts_tablet_manager-itest.cc
@@ -50,6 +50,7 @@
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/master/sys_catalog-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/master/sys_catalog-test.cc b/src/kudu/master/sys_catalog-test.cc
index e969b25..19a452f 100644
--- a/src/kudu/master/sys_catalog-test.cc
+++ b/src/kudu/master/sys_catalog-test.cc
@@ -39,6 +39,7 @@
#include "kudu/security/openssl_util.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/rpc/connection.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/connection.h b/src/kudu/rpc/connection.h
index 9e9957b..92ad56a 100644
--- a/src/kudu/rpc/connection.h
+++ b/src/kudu/rpc/connection.h
@@ -27,6 +27,7 @@
#include <unordered_map>
#include <boost/intrusive/list.hpp>
+#include <boost/optional/optional.hpp>
#include <ev++.h>
#include <glog/logging.h>
@@ -39,7 +40,6 @@
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/rpc/remote_user.h"
#include "kudu/rpc/transfer.h"
-#include "kudu/rpc/user_credentials.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/net/socket.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tablet/memrowset.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/memrowset.h b/src/kudu/tablet/memrowset.h
index 5c15851..c4cafa3 100644
--- a/src/kudu/tablet/memrowset.h
+++ b/src/kudu/tablet/memrowset.h
@@ -52,6 +52,7 @@ namespace kudu {
class MemTracker;
class MemoryTrackingBufferAllocator;
+class MonoTime;
class RowBlock;
class RowBlockRow;
class RowChangeList;
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tablet/tablet_metadata.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_metadata.h b/src/kudu/tablet/tablet_metadata.h
index 3bbd849..650ac15 100644
--- a/src/kudu/tablet/tablet_metadata.h
+++ b/src/kudu/tablet/tablet_metadata.h
@@ -17,6 +17,7 @@
#ifndef KUDU_TABLET_TABLET_METADATA_H
#define KUDU_TABLET_TABLET_METADATA_H
+#include <algorithm>
#include <atomic>
#include <cstdint>
#include <memory>
@@ -24,10 +25,10 @@
#include <unordered_set>
#include <vector>
+#include <boost/optional/optional.hpp>
#include <glog/logging.h>
#include "kudu/common/partition.h"
-#include "kudu/consensus/opid.pb.h"
#include "kudu/fs/block_id.h"
#include "kudu/gutil/atomicops.h"
#include "kudu/gutil/gscoped_ptr.h"
@@ -40,17 +41,16 @@
#include "kudu/util/status.h"
#include "kudu/util/status_callback.h"
-namespace boost {
-template <class T>
-class optional;
-}
-
namespace kudu {
class BlockIdPB;
class FsManager;
class Schema;
+namespace consensus {
+class OpId;
+}
+
namespace tablet {
class RowSetMetadata;
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tablet/tablet_replica-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_replica-test.cc b/src/kudu/tablet/tablet_replica-test.cc
index 1f7de80..b358b59 100644
--- a/src/kudu/tablet/tablet_replica-test.cc
+++ b/src/kudu/tablet/tablet_replica-test.cc
@@ -21,6 +21,7 @@
#include <ostream>
#include <string>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tools/ksck.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc
index 9043b12..957c39f 100644
--- a/src/kudu/tools/ksck.cc
+++ b/src/kudu/tools/ksck.cc
@@ -24,6 +24,7 @@
#include <iterator>
#include <map>
#include <mutex>
+#include <type_traits>
#include <boost/optional.hpp> // IWYU pragma: keep
#include <gflags/gflags.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tools/kudu-tool-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 0051f91..1b07853 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -29,6 +29,7 @@
#include <utility>
#include <vector>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <glog/stl_logging.h>
@@ -55,6 +56,7 @@
#include "kudu/consensus/log_util.h"
#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/opid_util.h"
+#include "kudu/consensus/raft_consensus.h"
#include "kudu/consensus/ref_counted_replicate.h"
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tserver/tablet_copy_source_session.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_source_session.cc b/src/kudu/tserver/tablet_copy_source_session.cc
index bf6a313..2f62ab5 100644
--- a/src/kudu/tserver/tablet_copy_source_session.cc
+++ b/src/kudu/tserver/tablet_copy_source_session.cc
@@ -22,8 +22,10 @@
#include <ostream>
#include <vector>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
+#include "kudu/consensus/consensus.pb.h"
#include "kudu/consensus/log.h"
#include "kudu/consensus/log.pb.h"
#include "kudu/consensus/log_reader.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tserver/tablet_server_test_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server_test_util.cc b/src/kudu/tserver/tablet_server_test_util.cc
index 1b884be..f849549 100644
--- a/src/kudu/tserver/tablet_server_test_util.cc
+++ b/src/kudu/tserver/tablet_server_test_util.cc
@@ -17,12 +17,11 @@
#include "kudu/tserver/tablet_server_test_util.h"
-#include <string>
-
#include "kudu/consensus/consensus.proxy.h"
#include "kudu/server/server_base.proxy.h"
#include "kudu/tserver/tserver_admin.proxy.h"
#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/util/net/sockaddr.h"
namespace kudu {
namespace tserver {
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/tserver/tablet_service.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_service.cc b/src/kudu/tserver/tablet_service.cc
index 9f0bfe2..8cc0262 100644
--- a/src/kudu/tserver/tablet_service.cc
+++ b/src/kudu/tserver/tablet_service.cc
@@ -50,6 +50,7 @@
#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/consensus.pb.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/raft_consensus.h"
#include "kudu/consensus/time_manager.h"
#include "kudu/gutil/casts.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/e1c753e5/src/kudu/util/net/sockaddr.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/net/sockaddr.cc b/src/kudu/util/net/sockaddr.cc
index 3b99490..60905b2 100644
--- a/src/kudu/util/net/sockaddr.cc
+++ b/src/kudu/util/net/sockaddr.cc
@@ -28,7 +28,6 @@
#include "kudu/gutil/endian.h"
#include "kudu/gutil/hash/builtin_type_hash.h"
#include "kudu/gutil/port.h"
-#include "kudu/gutil/stringprintf.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/stopwatch.h"