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/24 21:04:28 UTC
[2/2] kudu git commit: [iwyu] another catch-up update
[iwyu] another catch-up update
This is just another catch-up patch after recent updates:
since the IWYU gerrit was not enabled for a while, some files
became not compliant with IWYU. This patch fixes that,
keeping the code in IWYU-compliant state.
I also sneaked in a few updates on other files to remove them
from the 'muted' list in build-support/iwyu/iwyu-filter.awk
Change-Id: I1690e59e8756732db9d23c1506be9f3aa2272ec1
Reviewed-on: http://gerrit.cloudera.org:8080/7802
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f9a6a1b2
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f9a6a1b2
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f9a6a1b2
Branch: refs/heads/master
Commit: f9a6a1b2d15feb8e2c044f20248774105a3a62bf
Parents: 36d888b
Author: Alexey Serbin <as...@cloudera.com>
Authored: Thu Aug 24 07:48:39 2017 -0700
Committer: Alexey Serbin <as...@cloudera.com>
Committed: Thu Aug 24 21:03:10 2017 +0000
----------------------------------------------------------------------
build-support/iwyu/iwyu-filter.awk | 31 --------------------
src/kudu/cfile/index_btree.cc | 3 +-
src/kudu/cfile/mt-bloomfile-test.cc | 10 +++++++
src/kudu/clock/hybrid_clock-test.cc | 4 ++-
src/kudu/clock/logical_clock-test.cc | 3 --
src/kudu/codegen/codegen-test.cc | 2 +-
src/kudu/common/partition-test.cc | 3 +-
src/kudu/common/partition_pruner-test.cc | 1 +
.../consensus_meta_manager-stress-test.cc | 13 ++++++--
src/kudu/consensus/consensus_peers.cc | 2 --
src/kudu/consensus/consensus_peers.h | 2 --
src/kudu/consensus/raft_consensus.cc | 2 --
src/kudu/consensus/raft_consensus.h | 7 +----
src/kudu/fs/block_manager-stress-test.cc | 6 +---
src/kudu/fs/block_manager-test.cc | 5 ++--
src/kudu/fs/block_manager.h | 1 -
src/kudu/fs/block_manager_util-test.cc | 5 +---
src/kudu/fs/block_manager_util.cc | 3 +-
src/kudu/fs/block_manager_util.h | 3 +-
src/kudu/fs/data_dirs-test.cc | 11 ++++++-
src/kudu/fs/data_dirs.cc | 5 +++-
src/kudu/fs/data_dirs.h | 1 -
src/kudu/fs/file_block_manager.cc | 1 +
src/kudu/fs/file_block_manager.h | 2 +-
src/kudu/fs/fs_manager-test.cc | 4 +++
src/kudu/fs/fs_manager.cc | 4 ++-
src/kudu/fs/fs_manager.h | 3 +-
src/kudu/fs/log_block_manager-test.cc | 21 +++++++++++++
src/kudu/fs/log_block_manager.cc | 1 -
src/kudu/fs/log_block_manager.h | 3 +-
.../integration-tests/disk_failure-itest.cc | 10 +++++--
.../ts_tablet_manager-itest.cc | 3 +-
src/kudu/rpc/connection.h | 1 -
src/kudu/rpc/negotiation-test.cc | 18 +++++++++++-
src/kudu/rpc/negotiation.cc | 5 +++-
src/kudu/rpc/outbound_call.h | 1 -
src/kudu/rpc/periodic-test.cc | 3 +-
src/kudu/rpc/periodic.cc | 4 +--
src/kudu/rpc/periodic.h | 3 +-
src/kudu/rpc/reactor.cc | 1 +
src/kudu/rpc/reactor.h | 2 +-
src/kudu/rpc/rpc-test.cc | 10 +++----
src/kudu/rpc/rpc_stub-test.cc | 8 ++---
src/kudu/rpc/transfer.cc | 2 +-
src/kudu/rpc/transfer.h | 1 -
src/kudu/security/ca/cert_management-test.cc | 7 +++--
src/kudu/security/cert-test.cc | 6 ++--
src/kudu/security/crypto-test.cc | 7 +++--
src/kudu/security/tls_handshake-test.cc | 10 +++++--
src/kudu/security/token-test.cc | 8 +++++
src/kudu/server/rpc_server-test.cc | 3 ++
.../tablet/all_types-scan-correctness-test.cc | 30 +++++++++++++++++--
src/kudu/tablet/deltafile.cc | 1 +
src/kudu/tablet/diskrowset.cc | 2 ++
src/kudu/tablet/memrowset.h | 2 +-
.../tablet/mt-rowset_delta_compaction-test.cc | 3 +-
src/kudu/tablet/mt-tablet-test.cc | 2 ++
src/kudu/tablet/tablet_replica.cc | 3 ++
src/kudu/tablet/tablet_replica.h | 1 -
.../transactions/transaction_tracker-test.cc | 7 +----
src/kudu/tools/tool_action.cc | 2 +-
src/kudu/tools/tool_action_master.cc | 9 ++++--
src/kudu/tools/tool_action_tablet.cc | 2 +-
src/kudu/tools/tool_action_tserver.cc | 8 +++--
.../tserver/tablet_copy_source_session-test.cc | 2 --
src/kudu/util/compression/compression-test.cc | 6 +---
src/kudu/util/file_cache-stress-test.cc | 8 ++++-
src/kudu/util/subprocess.cc | 2 ++
68 files changed, 222 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/build-support/iwyu/iwyu-filter.awk
----------------------------------------------------------------------
diff --git a/build-support/iwyu/iwyu-filter.awk b/build-support/iwyu/iwyu-filter.awk
index 06977e3..fc54694 100644
--- a/build-support/iwyu/iwyu-filter.awk
+++ b/build-support/iwyu/iwyu-filter.awk
@@ -71,68 +71,37 @@ BEGIN {
# suggestions are addressed and invalid ones are taken care either by proper
# IWYU pragmas or adding special mappings (e.g. like boost mappings).
muted["kudu/cfile/cfile_writer.h"]
- muted["kudu/cfile/mt-bloomfile-test.cc"]
muted["kudu/client/client-internal.h"]
muted["kudu/client/client-test.cc"]
- muted["kudu/clock/hybrid_clock-test.cc"]
- muted["kudu/clock/logical_clock-test.cc"]
- muted["kudu/codegen/codegen-test.cc"]
muted["kudu/common/encoded_key-test.cc"]
- muted["kudu/common/partition-test.cc"]
- muted["kudu/common/partition_pruner-test.cc"]
muted["kudu/common/schema.h"]
muted["kudu/consensus/consensus_meta-test.cc"]
- muted["kudu/consensus/consensus_meta_manager-stress-test.cc"]
- muted["kudu/consensus/raft_consensus.h"]
muted["kudu/consensus/raft_consensus_quorum-test.cc"]
muted["kudu/experiments/rwlock-perf.cc"]
- muted["kudu/fs/block_manager-stress-test.cc"]
- muted["kudu/fs/block_manager_util-test.cc"]
- muted["kudu/fs/data_dirs-test.cc"]
- 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/token_signer-itest.cc"]
- muted["kudu/rpc/negotiation-test.cc"]
- muted["kudu/rpc/negotiation.cc"]
muted["kudu/rpc/reactor.cc"]
muted["kudu/rpc/reactor.h"]
- muted["kudu/rpc/rpc-test.cc"]
muted["kudu/rpc/rpc_sidecar.h"]
- muted["kudu/rpc/rpc_stub-test.cc"]
- muted["kudu/security/ca/cert_management-test.cc"]
muted["kudu/security/ca/cert_management.cc"]
muted["kudu/security/ca/cert_management.h"]
muted["kudu/security/cert-test.cc"]
muted["kudu/security/cert.cc"]
muted["kudu/security/cert.h"]
- muted["kudu/security/crypto-test.cc"]
muted["kudu/security/openssl_util.cc"]
muted["kudu/security/openssl_util.h"]
muted["kudu/security/tls_context.cc"]
- muted["kudu/security/tls_handshake-test.cc"]
muted["kudu/security/tls_handshake.cc"]
muted["kudu/security/tls_socket.h"]
- muted["kudu/security/token-test.cc"]
muted["kudu/security/x509_check_host.cc"]
muted["kudu/server/default-path-handlers.cc"]
- muted["kudu/server/rpc_server-test.cc"]
muted["kudu/server/webserver.cc"]
- muted["kudu/tablet/all_types-scan-correctness-test.cc"]
- muted["kudu/tablet/diskrowset.cc"]
- muted["kudu/tablet/mt-rowset_delta_compaction-test.cc"]
- muted["kudu/tablet/mt-tablet-test.cc"]
muted["kudu/tablet/tablet.cc"]
muted["kudu/tablet/tablet_history_gc-test.cc"]
muted["kudu/tablet/transactions/transaction_tracker-test.cc"]
- muted["kudu/tools/tool_action.cc"]
muted["kudu/tools/tool_action_local_replica.cc"]
- muted["kudu/tools/tool_action_master.cc"]
- muted["kudu/tools/tool_action_tablet.cc"]
- muted["kudu/tools/tool_action_tserver.cc"]
muted["kudu/tserver/tablet_copy_service-test.cc"]
muted["kudu/util/bit-util-test.cc"]
- muted["kudu/util/compression/compression-test.cc"]
muted["kudu/util/env_util-test.cc"]
muted["kudu/util/file_cache-stress-test.cc"]
muted["kudu/util/group_varint-test.cc"]
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/cfile/index_btree.cc
----------------------------------------------------------------------
diff --git a/src/kudu/cfile/index_btree.cc b/src/kudu/cfile/index_btree.cc
index e47c679..24eaa19 100644
--- a/src/kudu/cfile/index_btree.cc
+++ b/src/kudu/cfile/index_btree.cc
@@ -23,9 +23,10 @@
#include "kudu/cfile/cfile.pb.h"
#include "kudu/cfile/cfile_reader.h"
-#include "kudu/cfile/cfile_writer.h"
#include "kudu/cfile/cfile_util.h"
+#include "kudu/cfile/cfile_writer.h"
#include "kudu/cfile/index_btree.h"
+#include "kudu/fs/block_id.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/debug-util.h"
#include "kudu/util/make_shared.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/cfile/mt-bloomfile-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/cfile/mt-bloomfile-test.cc b/src/kudu/cfile/mt-bloomfile-test.cc
index f0288b1..76aada1 100644
--- a/src/kudu/cfile/mt-bloomfile-test.cc
+++ b/src/kudu/cfile/mt-bloomfile-test.cc
@@ -17,9 +17,19 @@
#include "kudu/cfile/bloomfile-test-base.h"
+#include <cstdint>
+#include <vector>
+
#include <boost/bind.hpp> // IWYU pragma: keep
#include <gflags/gflags.h>
#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include "kudu/gutil/ref_counted.h"
+#include "kudu/gutil/strings/substitute.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
+#include "kudu/util/thread.h"
DEFINE_int32(benchmark_num_threads, 8, "Number of threads to use for the benchmark");
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/clock/hybrid_clock-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/clock/hybrid_clock-test.cc b/src/kudu/clock/hybrid_clock-test.cc
index dc29c7c..e3d2afd 100644
--- a/src/kudu/clock/hybrid_clock-test.cc
+++ b/src/kudu/clock/hybrid_clock-test.cc
@@ -20,14 +20,16 @@
#include <string>
#include <vector>
+#include <gflags/gflags.h>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/clock/hybrid_clock.h"
#include "kudu/clock/mock_ntp.h"
+#include "kudu/clock/time_service.h"
#include "kudu/common/timestamp.h"
-#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/casts.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/atomic.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/clock/logical_clock-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/clock/logical_clock-test.cc b/src/kudu/clock/logical_clock-test.cc
index 78d2b13..2dcad70 100644
--- a/src/kudu/clock/logical_clock-test.cc
+++ b/src/kudu/clock/logical_clock-test.cc
@@ -15,13 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-#include <string>
-
#include <gtest/gtest.h>
#include "kudu/clock/logical_clock.h"
#include "kudu/common/timestamp.h"
-#include "kudu/gutil/map-util.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/codegen/codegen-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/codegen/codegen-test.cc b/src/kudu/codegen/codegen-test.cc
index 3a64d18..74091f4 100644
--- a/src/kudu/codegen/codegen-test.cc
+++ b/src/kudu/codegen/codegen-test.cc
@@ -25,7 +25,7 @@
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <glog/stl_logging.h> // IWYU pragma: keep
-#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
#include <gtest/gtest.h>
#include "kudu/codegen/code_generator.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/common/partition-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/common/partition-test.cc b/src/kudu/common/partition-test.cc
index 2a35244..be632e5 100644
--- a/src/kudu/common/partition-test.cc
+++ b/src/kudu/common/partition-test.cc
@@ -22,7 +22,8 @@
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
+#include <gflags/gflags.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/common/partition_pruner-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/common/partition_pruner-test.cc b/src/kudu/common/partition_pruner-test.cc
index 0208529..467b54c 100644
--- a/src/kudu/common/partition_pruner-test.cc
+++ b/src/kudu/common/partition_pruner-test.cc
@@ -20,6 +20,7 @@
#include <algorithm>
#include <cstddef>
#include <cstdint>
+#include <deque>
#include <memory>
#include <string>
#include <utility>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/consensus/consensus_meta_manager-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/consensus_meta_manager-stress-test.cc b/src/kudu/consensus/consensus_meta_manager-stress-test.cc
index 3442950..9e524aa 100644
--- a/src/kudu/consensus/consensus_meta_manager-stress-test.cc
+++ b/src/kudu/consensus/consensus_meta_manager-stress-test.cc
@@ -15,25 +15,34 @@
// specific language governing permissions and limitations
// under the License.
+#include <unistd.h>
+
+#include <algorithm>
#include <atomic>
+#include <cstdint>
+#include <memory>
#include <mutex>
+#include <ostream>
#include <string>
#include <thread>
#include <unordered_map>
#include <vector>
-#include <glog/stl_logging.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
#include "kudu/consensus/consensus_meta.h"
#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
-#include "kudu/consensus/quorum_util.h"
#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/util/barrier.h"
#include "kudu/util/locks.h"
#include "kudu/util/random.h"
#include "kudu/util/scoped_cleanup.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/f9a6a1b2/src/kudu/consensus/consensus_peers.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/consensus_peers.cc b/src/kudu/consensus/consensus_peers.cc
index 17fcc18..26f6ab4 100644
--- a/src/kudu/consensus/consensus_peers.cc
+++ b/src/kudu/consensus/consensus_peers.cc
@@ -24,7 +24,6 @@
#include <type_traits>
#include <vector>
-#include <boost/function.hpp>
#include <gflags/gflags.h>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
@@ -38,7 +37,6 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/move.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/rpc/messenger.h"
#include "kudu/rpc/periodic.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/fault_injection.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/consensus/consensus_peers.h
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/consensus_peers.h b/src/kudu/consensus/consensus_peers.h
index 78f0a4b..7d1ff74 100644
--- a/src/kudu/consensus/consensus_peers.h
+++ b/src/kudu/consensus/consensus_peers.h
@@ -34,8 +34,6 @@
#include "kudu/rpc/response_callback.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/util/locks.h"
-#include "kudu/util/monotime.h"
-#include "kudu/util/random.h"
#include "kudu/util/status.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/consensus/raft_consensus.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/raft_consensus.cc b/src/kudu/consensus/raft_consensus.cc
index 11d1e40..07d78b8 100644
--- a/src/kudu/consensus/raft_consensus.cc
+++ b/src/kudu/consensus/raft_consensus.cc
@@ -44,9 +44,7 @@
#include "kudu/consensus/peer_manager.h"
#include "kudu/consensus/pending_rounds.h"
#include "kudu/consensus/quorum_util.h"
-#include "kudu/gutil/basictypes.h"
#include "kudu/gutil/bind.h"
-#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/move.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/consensus/raft_consensus.h
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/raft_consensus.h b/src/kudu/consensus/raft_consensus.h
index ee61fff..224535e 100644
--- a/src/kudu/consensus/raft_consensus.h
+++ b/src/kudu/consensus/raft_consensus.h
@@ -25,6 +25,7 @@
#include <string>
#include <vector>
+#include <boost/optional/optional.hpp>
#include <glog/logging.h>
#include <gtest/gtest_prod.h>
@@ -50,14 +51,8 @@
#include "kudu/util/random.h"
#include "kudu/util/status_callback.h"
-namespace boost {
-template <class T>
-class optional;
-}
-
namespace kudu {
-
typedef std::lock_guard<simple_spinlock> Lock;
typedef gscoped_ptr<Lock> ScopedLock;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/block_manager-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager-stress-test.cc b/src/kudu/fs/block_manager-stress-test.cc
index c3e5993..e03cbc4 100644
--- a/src/kudu/fs/block_manager-stress-test.cc
+++ b/src/kudu/fs/block_manager-stress-test.cc
@@ -38,11 +38,10 @@
#include "kudu/fs/file_block_manager.h" // IWYU pragma: keep
#include "kudu/fs/fs.pb.h"
#include "kudu/fs/fs_report.h"
-#include "kudu/fs/log_block_manager.h" // IWYU pragma: keep
#include "kudu/fs/log_block_manager-test-util.h"
+#include "kudu/fs/log_block_manager.h" // IWYU pragma: keep
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
-#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/split.h"
@@ -96,9 +95,6 @@ using strings::Substitute;
namespace kudu {
namespace fs {
-class FileBlockManager;
-class LogBlockManager;
-
// This test attempts to simulate how a TS might use the block manager:
//
// writing threads (default 2) that do the following in a tight loop:
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/block_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager-test.cc b/src/kudu/fs/block_manager-test.cc
index b4a9494..8755d46 100644
--- a/src/kudu/fs/block_manager-test.cc
+++ b/src/kudu/fs/block_manager-test.cc
@@ -32,17 +32,16 @@
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
+#include "kudu/fs/data_dirs.h"
+#include "kudu/fs/error_manager.h"
#include "kudu/fs/file_block_manager.h"
#include "kudu/fs/fs.pb.h"
#include "kudu/fs/fs_report.h"
-#include "kudu/fs/data_dirs.h"
-#include "kudu/fs/error_manager.h"
#include "kudu/fs/log_block_manager.h"
#include "kudu/gutil/bind.h"
#include "kudu/gutil/casts.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
-#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/block_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager.h b/src/kudu/fs/block_manager.h
index 0177d33..28d4a12 100644
--- a/src/kudu/fs/block_manager.h
+++ b/src/kudu/fs/block_manager.h
@@ -41,7 +41,6 @@ class Slice;
namespace fs {
class BlockManager;
-class DataDirManager;
class FsErrorManager;
struct FsReport;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/block_manager_util-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager_util-test.cc b/src/kudu/fs/block_manager_util-test.cc
index 500f415..75609fd 100644
--- a/src/kudu/fs/block_manager_util-test.cc
+++ b/src/kudu/fs/block_manager_util-test.cc
@@ -19,20 +19,17 @@
#include <memory>
#include <ostream>
#include <string>
-#include <type_traits>
#include <vector>
#include <glog/logging.h>
-#include <google/protobuf/repeated_field.h>
+#include <google/protobuf/repeated_field.h> // IWYU pragma: keep
#include <gtest/gtest.h>
#include "kudu/fs/block_manager_util.h"
#include "kudu/fs/fs.pb.h"
-#include "kudu/gutil/move.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/env.h"
-#include "kudu/util/path_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/f9a6a1b2/src/kudu/fs/block_manager_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager_util.cc b/src/kudu/fs/block_manager_util.cc
index 1f7f66f..6ba5278 100644
--- a/src/kudu/fs/block_manager_util.cc
+++ b/src/kudu/fs/block_manager_util.cc
@@ -20,7 +20,6 @@
#include <cstdint>
#include <ostream>
#include <set>
-#include <type_traits>
#include <unordered_map>
#include <gflags/gflags_declare.h>
@@ -28,7 +27,7 @@
#include "kudu/fs/fs.pb.h"
#include "kudu/gutil/map-util.h"
-#include "kudu/gutil/move.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/env.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/block_manager_util.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/block_manager_util.h b/src/kudu/fs/block_manager_util.h
index 259e0bd..c8fd2cf 100644
--- a/src/kudu/fs/block_manager_util.h
+++ b/src/kudu/fs/block_manager_util.h
@@ -17,12 +17,11 @@
#pragma once
-#include <set>
+#include <memory>
#include <string>
#include <vector>
#include "kudu/util/path_util.h"
-#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/data_dirs-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/data_dirs-test.cc b/src/kudu/fs/data_dirs-test.cc
index 85befee..8f22778 100644
--- a/src/kudu/fs/data_dirs-test.cc
+++ b/src/kudu/fs/data_dirs-test.cc
@@ -15,23 +15,32 @@
// specific language governing permissions and limitations
// under the License.
+#include <cmath>
+#include <cstdint>
+#include <memory>
+#include <ostream>
#include <set>
#include <string>
+#include <unordered_map>
+#include <utility>
#include <vector>
#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/fs/block_manager.h"
-#include "kudu/fs/block_manager_util.h"
#include "kudu/fs/data_dirs.h"
#include "kudu/fs/fs.pb.h"
+#include "kudu/gutil/casts.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/env.h"
#include "kudu/util/metrics.h"
#include "kudu/util/path_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/f9a6a1b2/src/kudu/fs/data_dirs.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/data_dirs.cc b/src/kudu/fs/data_dirs.cc
index 19ae6c4..905b6cd 100644
--- a/src/kudu/fs/data_dirs.cc
+++ b/src/kudu/fs/data_dirs.cc
@@ -21,6 +21,7 @@
#include <cerrno>
#include <cstdint>
#include <deque>
+#include <iterator>
#include <memory>
#include <mutex>
#include <numeric>
@@ -28,16 +29,19 @@
#include <random>
#include <string>
#include <unordered_map>
+#include <unordered_set>
#include <utility>
#include <vector>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include "kudu/fs/block_manager.h"
#include "kudu/fs/block_manager_util.h"
#include "kudu/gutil/bind.h"
#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
@@ -52,7 +56,6 @@
#include "kudu/util/oid_generator.h"
#include "kudu/util/path_util.h"
#include "kudu/util/random_util.h"
-#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
#include "kudu/util/stopwatch.h"
#include "kudu/util/test_util_prod.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/data_dirs.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/data_dirs.h b/src/kudu/fs/data_dirs.h
index a110a5d..96a7cfa 100644
--- a/src/kudu/fs/data_dirs.h
+++ b/src/kudu/fs/data_dirs.h
@@ -24,7 +24,6 @@
#include <set>
#include <string>
#include <unordered_map>
-#include <utility>
#include <vector>
#include <glog/logging.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/file_block_manager.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/file_block_manager.cc b/src/kudu/fs/file_block_manager.cc
index 26aa10a..dfb16e9 100644
--- a/src/kudu/fs/file_block_manager.cc
+++ b/src/kudu/fs/file_block_manager.cc
@@ -36,6 +36,7 @@
#include "kudu/fs/error_manager.h"
#include "kudu/fs/fs_report.h"
#include "kudu/gutil/bind.h"
+#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stringprintf.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/file_block_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/file_block_manager.h b/src/kudu/fs/file_block_manager.h
index 6c6cc81..7e2de97 100644
--- a/src/kudu/fs/file_block_manager.h
+++ b/src/kudu/fs/file_block_manager.h
@@ -25,7 +25,6 @@
#include <vector>
#include "kudu/fs/block_manager.h"
-#include "kudu/fs/data_dirs.h"
#include "kudu/gutil/macros.h"
#include "kudu/util/atomic.h"
#include "kudu/util/file_cache.h"
@@ -41,6 +40,7 @@ class MemTracker;
class RandomAccessFile;
namespace fs {
+class DataDirManager;
class FsErrorManager;
struct FsReport;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/fs_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/fs_manager-test.cc b/src/kudu/fs/fs_manager-test.cc
index 47b3fb5..9612826 100644
--- a/src/kudu/fs/fs_manager-test.cc
+++ b/src/kudu/fs/fs_manager-test.cc
@@ -18,9 +18,11 @@
#include <sys/stat.h>
#include <unistd.h>
+#include <cstddef>
#include <cstdint>
#include <iostream>
#include <memory>
+#include <set>
#include <string>
#include <unordered_set>
#include <vector>
@@ -31,8 +33,10 @@
#include <gtest/gtest.h>
#include "kudu/fs/block_manager.h"
+#include "kudu/fs/data_dirs.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/stringprintf.h"
#include "kudu/gutil/strings/substitute.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/fs_manager.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/fs_manager.cc b/src/kudu/fs/fs_manager.cc
index caf007a..90494de 100644
--- a/src/kudu/fs/fs_manager.cc
+++ b/src/kudu/fs/fs_manager.cc
@@ -23,12 +23,12 @@
#include <deque>
#include <iostream>
#include <map>
+#include <set>
#include <unordered_set>
#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
#include <glog/logging.h>
-#include <glog/stl_logging.h>
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
@@ -38,8 +38,10 @@
#include "kudu/fs/fs.pb.h"
#include "kudu/fs/log_block_manager.h"
#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/stringprintf.h"
#include "kudu/gutil/strings/join.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/fs_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/fs_manager.h b/src/kudu/fs/fs_manager.h
index b8e9ad9..2ff8b91 100644
--- a/src/kudu/fs/fs_manager.h
+++ b/src/kudu/fs/fs_manager.h
@@ -21,7 +21,6 @@
#include <cstdint>
#include <iosfwd>
#include <memory>
-#include <set>
#include <string>
#include <vector>
@@ -30,6 +29,7 @@
#include <glog/logging.h>
#include <gtest/gtest_prod.h>
+#include "kudu/fs/data_dirs.h"
#include "kudu/fs/error_manager.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
@@ -49,7 +49,6 @@ class MetricEntity;
namespace fs {
class BlockManager;
-class DataDirManager;
class ReadableBlock;
class WritableBlock;
struct FsReport;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/log_block_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager-test.cc b/src/kudu/fs/log_block_manager-test.cc
index a7fa3ed..e33e773 100644
--- a/src/kudu/fs/log_block_manager-test.cc
+++ b/src/kudu/fs/log_block_manager-test.cc
@@ -16,13 +16,26 @@
// under the License.
#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <deque>
#include <memory>
+#include <ostream>
#include <set>
#include <string>
#include <unordered_map>
#include <unordered_set>
+#include <utility>
#include <vector>
+#include <boost/optional/optional.hpp>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include "kudu/fs/block_id.h"
+#include "kudu/fs/block_manager.h"
#include "kudu/fs/data_dirs.h"
#include "kudu/fs/error_manager.h"
#include "kudu/fs/fs.pb.h"
@@ -30,14 +43,22 @@
#include "kudu/fs/log_block_manager-test-util.h"
#include "kudu/fs/log_block_manager.h"
#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
+#include "kudu/gutil/casts.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/strings/util.h"
+#include "kudu/util/atomic.h"
+#include "kudu/util/env.h"
#include "kudu/util/metrics.h"
#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/random.h"
+#include "kudu/util/slice.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/f9a6a1b2/src/kudu/fs/log_block_manager.cc
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index 6f0648f..b733d23 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -45,7 +45,6 @@
#include "kudu/gutil/bind.h"
#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/callback.h"
-#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/stl_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/fs/log_block_manager.h
----------------------------------------------------------------------
diff --git a/src/kudu/fs/log_block_manager.h b/src/kudu/fs/log_block_manager.h
index 0407841..4aa61d8 100644
--- a/src/kudu/fs/log_block_manager.h
+++ b/src/kudu/fs/log_block_manager.h
@@ -33,7 +33,6 @@
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
-#include "kudu/fs/data_dirs.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/atomic.h"
@@ -50,6 +49,8 @@ class Env;
class RWFile;
namespace fs {
+class DataDir;
+class DataDirManager;
class FsErrorManager;
struct FsReport;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/integration-tests/disk_failure-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/disk_failure-itest.cc b/src/kudu/integration-tests/disk_failure-itest.cc
index c36ccd1..cfa337d 100644
--- a/src/kudu/integration-tests/disk_failure-itest.cc
+++ b/src/kudu/integration-tests/disk_failure-itest.cc
@@ -15,19 +15,23 @@
// specific language governing permissions and limitations
// under the License.
-#include <gtest/gtest.h>
-
+#include <cstdint>
+#include <memory>
#include <string>
#include <vector>
+#include <gtest/gtest.h>
+
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/integration-tests/cluster_itest_util.h"
#include "kudu/integration-tests/cluster_verifier.h"
#include "kudu/integration-tests/external_mini_cluster-itest-base.h"
+#include "kudu/integration-tests/external_mini_cluster.h"
#include "kudu/integration-tests/test_workload.h"
#include "kudu/util/metrics.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/path_util.h"
#include "kudu/util/test_macros.h"
+#include "kudu/util/test_util.h"
METRIC_DECLARE_gauge_uint64(data_dirs_failed);
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/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 97ccf77..a09fdb1 100644
--- a/src/kudu/integration-tests/ts_tablet_manager-itest.cc
+++ b/src/kudu/integration-tests/ts_tablet_manager-itest.cc
@@ -33,8 +33,6 @@
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/quorum_util.h"
#include "kudu/consensus/raft_consensus.h"
-#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
@@ -45,6 +43,7 @@
#include "kudu/master/master.proxy.h"
#include "kudu/master/mini_master.h"
#include "kudu/rpc/messenger.h"
+#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/tserver/heartbeater.h"
#include "kudu/tserver/mini_tablet_server.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/connection.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/connection.h b/src/kudu/rpc/connection.h
index 44c85f7..d85b52d 100644
--- a/src/kudu/rpc/connection.h
+++ b/src/kudu/rpc/connection.h
@@ -32,7 +32,6 @@
#include <glog/logging.h>
#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/rpc/connection_id.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/negotiation-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/negotiation-test.cc b/src/kudu/rpc/negotiation-test.cc
index 43ec276..2ea2596 100644
--- a/src/kudu/rpc/negotiation-test.cc
+++ b/src/kudu/rpc/negotiation-test.cc
@@ -17,16 +17,23 @@
#include "kudu/rpc/rpc-test-base.h"
-#include <stdlib.h>
#include <sys/stat.h>
+#include <unistd.h>
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
#include <functional>
#include <memory>
#include <ostream>
#include <string>
#include <thread>
+#include <vector>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include <sasl/sasl.h>
@@ -35,20 +42,29 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/walltime.h"
#include "kudu/rpc/client_negotiation.h"
+#include "kudu/rpc/messenger.h"
#include "kudu/rpc/negotiation.h"
+#include "kudu/rpc/remote_user.h"
+#include "kudu/rpc/sasl_common.h"
#include "kudu/rpc/server_negotiation.h"
+#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
#include "kudu/security/security-test-util.h"
#include "kudu/security/test/mini_kdc.h"
#include "kudu/security/tls_context.h"
#include "kudu/security/tls_socket.h"
+#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_signing_key.h"
#include "kudu/security/token_verifier.h"
+#include "kudu/util/env.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/net/socket.h"
+#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
+#include "kudu/util/test_macros.h"
+#include "kudu/util/test_util.h"
#include "kudu/util/trace.h"
#include "kudu/util/user.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/negotiation.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/negotiation.cc b/src/kudu/rpc/negotiation.cc
index 646df54..f99fe2c 100644
--- a/src/kudu/rpc/negotiation.cc
+++ b/src/kudu/rpc/negotiation.cc
@@ -27,7 +27,7 @@
#include <ostream>
#include <string>
-#include <boost/optional.hpp> // IWYU pragma: keep
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
@@ -36,12 +36,15 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/client_negotiation.h"
#include "kudu/rpc/connection.h"
+#include "kudu/rpc/connection_id.h"
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/reactor.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/rpc/server_negotiation.h"
+#include "kudu/rpc/user_credentials.h"
#include "kudu/security/tls_context.h"
+#include "kudu/security/token.pb.h"
#include "kudu/util/errno.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/logging.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/outbound_call.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/outbound_call.h b/src/kudu/rpc/outbound_call.h
index 52788de..957c005 100644
--- a/src/kudu/rpc/outbound_call.h
+++ b/src/kudu/rpc/outbound_call.h
@@ -55,7 +55,6 @@ namespace kudu {
namespace rpc {
class CallResponse;
-class Connection;
class DumpRunningRpcsRequestPB;
class RpcCallInProgressPB;
class RpcController;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/periodic-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/periodic-test.cc b/src/kudu/rpc/periodic-test.cc
index a5b1a6a..b3fcaba 100644
--- a/src/kudu/rpc/periodic-test.cc
+++ b/src/kudu/rpc/periodic-test.cc
@@ -16,8 +16,9 @@
// under the License.
#include <atomic>
-#include <functional>
+#include <cstdint>
#include <memory>
+#include <string>
#include <gtest/gtest.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/periodic.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/periodic.cc b/src/kudu/rpc/periodic.cc
index 15d3471..e3bcf71 100644
--- a/src/kudu/rpc/periodic.cc
+++ b/src/kudu/rpc/periodic.cc
@@ -20,14 +20,12 @@
#include <algorithm>
#include <memory>
#include <mutex>
-#include <utility>
-#include <boost/optional.hpp>
+#include <boost/function.hpp>
#include <glog/logging.h>
#include "kudu/rpc/messenger.h"
#include "kudu/util/atomic.h"
-#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
#include "kudu/util/random.h"
#include "kudu/util/random_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/periodic.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/periodic.h b/src/kudu/rpc/periodic.h
index 7c5f5af..ada5020 100644
--- a/src/kudu/rpc/periodic.h
+++ b/src/kudu/rpc/periodic.h
@@ -20,8 +20,7 @@
#include <functional>
#include <memory>
-#include <boost/none.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
#include "kudu/gutil/macros.h"
#include "kudu/util/atomic.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/reactor.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/reactor.cc b/src/kudu/rpc/reactor.cc
index f46e8db..f18b07a 100644
--- a/src/kudu/rpc/reactor.cc
+++ b/src/kudu/rpc/reactor.cc
@@ -39,6 +39,7 @@
#include "kudu/rpc/connection.h"
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/negotiation.h"
+#include "kudu/rpc/outbound_call.h"
#include "kudu/rpc/rpc_introspection.pb.h"
#include "kudu/rpc/server_negotiation.h"
#include "kudu/util/countdown_latch.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/reactor.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/reactor.h b/src/kudu/rpc/reactor.h
index 6d39ba2..ad6278f 100644
--- a/src/kudu/rpc/reactor.h
+++ b/src/kudu/rpc/reactor.h
@@ -34,7 +34,6 @@
#include "kudu/rpc/connection.h"
#include "kudu/rpc/connection_id.h"
#include "kudu/rpc/messenger.h"
-#include "kudu/rpc/outbound_call.h"
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
@@ -52,6 +51,7 @@ typedef std::list<scoped_refptr<Connection>> conn_list_t;
class DumpRunningRpcsRequestPB;
class DumpRunningRpcsResponsePB;
+class OutboundCall;
class Reactor;
class ReactorThread;
enum class CredentialsPolicy;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/rpc-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/rpc-test.cc b/src/kudu/rpc/rpc-test.cc
index f07dc8d..6ccd92d 100644
--- a/src/kudu/rpc/rpc-test.cc
+++ b/src/kudu/rpc/rpc-test.cc
@@ -17,11 +17,10 @@
#include "kudu/rpc/rpc-test-base.h"
-#include <sys/resource.h>
-
#include <cerrno>
#include <cstdint>
#include <cstdlib>
+#include <cstring>
#include <memory>
#include <ostream>
#include <set>
@@ -30,7 +29,9 @@
#include <vector>
#include <boost/bind.hpp>
+#include <boost/core/ref.hpp>
#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/gutil/casts.h"
@@ -39,7 +40,6 @@
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/gutil/walltime.h"
#include "kudu/rpc/acceptor_pool.h"
#include "kudu/rpc/constants.h"
#include "kudu/rpc/messenger.h"
@@ -47,13 +47,13 @@
#include "kudu/rpc/proxy.h"
#include "kudu/rpc/reactor.h"
#include "kudu/rpc/rpc_controller.h"
-#include "kudu/rpc/rpc_header.pb.h"
+#include "kudu/rpc/rpc_sidecar.h"
#include "kudu/rpc/rtest.pb.h"
#include "kudu/rpc/serialization.h"
+#include "kudu/rpc/transfer.h"
#include "kudu/security/test/test_certs.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/env.h"
-#include "kudu/util/logging.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/sockaddr.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/rpc_stub-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/rpc_stub-test.cc b/src/kudu/rpc/rpc_stub-test.cc
index 2b787db..5fe2885 100644
--- a/src/kudu/rpc/rpc_stub-test.cc
+++ b/src/kudu/rpc/rpc_stub-test.cc
@@ -29,7 +29,10 @@
#include <vector>
#include <boost/bind.hpp>
+#include <boost/core/ref.hpp>
+#include <boost/function.hpp>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <glog/stl_logging.h>
#include <gtest/gtest.h>
@@ -40,7 +43,6 @@
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/rpc/messenger.h"
-#include "kudu/rpc/outbound_call.h"
#include "kudu/rpc/proxy.h"
#include "kudu/rpc/rpc-test-base.h"
#include "kudu/rpc/rpc_controller.h"
@@ -50,10 +52,9 @@
#include "kudu/rpc/rtest.pb.h"
#include "kudu/rpc/rtest.proxy.h"
#include "kudu/rpc/service_pool.h"
+#include "kudu/rpc/user_credentials.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/env.h"
-#include "kudu/util/locks.h"
-#include "kudu/util/logging.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/sockaddr.h"
@@ -62,7 +63,6 @@
#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
#include "kudu/util/test_macros.h"
-#include "kudu/util/test_util.h"
#include "kudu/util/thread_restrictions.h"
#include "kudu/util/user.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/transfer.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/transfer.cc b/src/kudu/rpc/transfer.cc
index f9fd746..67d845c 100644
--- a/src/kudu/rpc/transfer.cc
+++ b/src/kudu/rpc/transfer.cc
@@ -21,6 +21,7 @@
#include <cstdint>
#include <iostream>
+#include <set>
#include <gflags/gflags.h>
#include <glog/logging.h>
@@ -29,7 +30,6 @@
#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/constants.h"
-#include "kudu/rpc/outbound_call.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/logging.h"
#include "kudu/util/net/socket.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/rpc/transfer.h
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/transfer.h b/src/kudu/rpc/transfer.h
index a9ecb6c..9561f84 100644
--- a/src/kudu/rpc/transfer.h
+++ b/src/kudu/rpc/transfer.h
@@ -21,7 +21,6 @@
#include <array>
#include <cstddef>
#include <cstdint>
-#include <memory>
#include <string>
#include <boost/intrusive/list_hook.hpp>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/security/ca/cert_management-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/ca/cert_management-test.cc b/src/kudu/security/ca/cert_management-test.cc
index 97f423c..0c8abc8 100644
--- a/src/kudu/security/ca/cert_management-test.cc
+++ b/src/kudu/security/ca/cert_management-test.cc
@@ -17,12 +17,15 @@
#include "kudu/security/ca/cert_management.h"
-#include <memory>
+#include <string>
#include <utility>
#include <vector>
+#include <boost/optional/optional.hpp>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/gutil/strings/util.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
#include "kudu/security/openssl_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/security/cert-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/cert-test.cc b/src/kudu/security/cert-test.cc
index ff5d51a..12205e1 100644
--- a/src/kudu/security/cert-test.cc
+++ b/src/kudu/security/cert-test.cc
@@ -15,12 +15,14 @@
// specific language governing permissions and limitations
// under the License.
+#include <string>
#include <thread>
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_io.hpp>
+#include <boost/optional/optional.hpp>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
#include "kudu/gutil/strings/strip.h"
#include "kudu/security/cert.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/security/crypto-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/crypto-test.cc b/src/kudu/security/crypto-test.cc
index 87399e4..c1e32df 100644
--- a/src/kudu/security/crypto-test.cc
+++ b/src/kudu/security/crypto-test.cc
@@ -16,19 +16,20 @@
// under the License.
#include <cstring>
-#include <functional>
-#include <mutex>
+#include <string>
#include <utility>
#include <vector>
+#include <gtest/gtest.h>
+
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/gutil/strings/util.h"
#include "kudu/security/crypto.h"
#include "kudu/security/openssl_util.h"
#include "kudu/security/test/test_certs.h"
#include "kudu/util/env.h"
#include "kudu/util/path_util.h"
+#include "kudu/util/slice.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/f9a6a1b2/src/kudu/security/tls_handshake-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/tls_handshake-test.cc b/src/kudu/security/tls_handshake-test.cc
index 9dd038f..c863d05 100644
--- a/src/kudu/security/tls_handshake-test.cc
+++ b/src/kudu/security/tls_handshake-test.cc
@@ -18,21 +18,25 @@
#include "kudu/security/tls_handshake.h"
#include <atomic>
-#include <functional>
#include <iostream>
#include <string>
#include <thread>
#include <vector>
-#include <boost/optional.hpp>
-#include <gflags/gflags.h>
+#include <boost/optional/optional.hpp>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/security/ca/cert_management.h"
+#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
#include "kudu/security/security-test-util.h"
#include "kudu/security/tls_context.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/scoped_cleanup.h"
+#include "kudu/util/slice.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/f9a6a1b2/src/kudu/security/token-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/token-test.cc b/src/kudu/security/token-test.cc
index 173b81b..48902e9 100644
--- a/src/kudu/security/token-test.cc
+++ b/src/kudu/security/token-test.cc
@@ -16,18 +16,26 @@
// under the License.
#include <cstdint>
+#include <deque>
#include <memory>
#include <string>
#include <utility>
#include <vector>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
#include "kudu/gutil/walltime.h"
#include "kudu/security/crypto.h"
+#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_signing_key.h"
#include "kudu/security/token_verifier.h"
#include "kudu/util/make_shared.h"
+#include "kudu/util/monotime.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/f9a6a1b2/src/kudu/server/rpc_server-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/server/rpc_server-test.cc b/src/kudu/server/rpc_server-test.cc
index f6b8a76..8f7e4c7 100644
--- a/src/kudu/server/rpc_server-test.cc
+++ b/src/kudu/server/rpc_server-test.cc
@@ -19,10 +19,13 @@
#include <memory>
#include <vector>
+#include <gflags/gflags_declare.h>
#include <gtest/gtest.h>
+#include "kudu/gutil/ref_counted.h"
#include "kudu/rpc/messenger.h"
#include "kudu/server/rpc_server.h"
+#include "kudu/util/metrics.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/all_types-scan-correctness-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/all_types-scan-correctness-test.cc b/src/kudu/tablet/all_types-scan-correctness-test.cc
index 49c17e7..af06e84 100644
--- a/src/kudu/tablet/all_types-scan-correctness-test.cc
+++ b/src/kudu/tablet/all_types-scan-correctness-test.cc
@@ -14,13 +14,37 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
+
+#include <algorithm>
+#include <cinttypes>
+#include <cstddef>
+#include <cstdint>
+#include <ostream>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
#include <glog/logging.h>
#include <gtest/gtest.h>
-#include <kudu/util/flags.h>
-
+#include "kudu/common/column_predicate.h"
+#include "kudu/common/common.pb.h"
+#include "kudu/common/iterator.h"
+#include "kudu/common/partial_row.h"
+#include "kudu/common/scan_spec.h"
#include "kudu/common/schema.h"
-#include "kudu/tablet/tablet-test-base.h"
+#include "kudu/common/types.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/stringprintf.h"
+#include "kudu/gutil/strings/substitute.h"
+#include "kudu/tablet/local_tablet_writer.h"
+#include "kudu/tablet/tablet-test-util.h"
+#include "kudu/util/auto_release_pool.h"
+#include "kudu/util/compression/compression.pb.h"
+#include "kudu/util/memory/arena.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
using strings::Substitute;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/deltafile.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/deltafile.cc b/src/kudu/tablet/deltafile.cc
index 3bfdc96..2db7811 100644
--- a/src/kudu/tablet/deltafile.cc
+++ b/src/kudu/tablet/deltafile.cc
@@ -38,6 +38,7 @@
#include "kudu/common/schema.h"
#include "kudu/common/timestamp.h"
#include "kudu/common/types.h"
+#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/gscoped_ptr.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/diskrowset.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/diskrowset.cc b/src/kudu/tablet/diskrowset.cc
index f4f015b..bf7caa1 100644
--- a/src/kudu/tablet/diskrowset.cc
+++ b/src/kudu/tablet/diskrowset.cc
@@ -73,6 +73,8 @@ TAG_FLAG(default_composite_key_index_block_size_bytes, experimental);
namespace kudu {
+class Mutex;
+
namespace consensus {
class OpId;
}
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/memrowset.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/memrowset.h b/src/kudu/tablet/memrowset.h
index c4cafa3..cc4112a 100644
--- a/src/kudu/tablet/memrowset.h
+++ b/src/kudu/tablet/memrowset.h
@@ -45,6 +45,7 @@
#include "kudu/tablet/rowset_metadata.h"
#include "kudu/util/faststring.h"
#include "kudu/util/memory/arena.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/slice.h"
#include "kudu/util/status.h"
@@ -52,7 +53,6 @@ namespace kudu {
class MemTracker;
class MemoryTrackingBufferAllocator;
-class MonoTime;
class RowBlock;
class RowBlockRow;
class RowChangeList;
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/mt-rowset_delta_compaction-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/mt-rowset_delta_compaction-test.cc b/src/kudu/tablet/mt-rowset_delta_compaction-test.cc
index 7e13585..57be241 100644
--- a/src/kudu/tablet/mt-rowset_delta_compaction-test.cc
+++ b/src/kudu/tablet/mt-rowset_delta_compaction-test.cc
@@ -21,6 +21,7 @@
#include <vector>
#include <gflags/gflags.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/common/common.pb.h"
@@ -35,8 +36,6 @@
#include "kudu/tablet/diskrowset.h"
#include "kudu/tablet/mvcc.h"
#include "kudu/tablet/tablet.pb.h"
-#include "kudu/util/locks.h"
-#include "kudu/util/logging.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/mt-tablet-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/mt-tablet-test.cc b/src/kudu/tablet/mt-tablet-test.cc
index 66194c4..10bb8dc 100644
--- a/src/kudu/tablet/mt-tablet-test.cc
+++ b/src/kudu/tablet/mt-tablet-test.cc
@@ -23,6 +23,7 @@
#include <vector>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
@@ -39,6 +40,7 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tablet/local_tablet_writer.h"
#include "kudu/tablet/rowset.h"
+#include "kudu/tablet/tablet-harness.h"
#include "kudu/tablet/tablet-test-base.h"
#include "kudu/tablet/tablet.h"
#include "kudu/util/countdown_latch.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/tablet_replica.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_replica.cc b/src/kudu/tablet/tablet_replica.cc
index 7f5a72e..073a7f9 100644
--- a/src/kudu/tablet/tablet_replica.cc
+++ b/src/kudu/tablet/tablet_replica.cc
@@ -26,6 +26,8 @@
#include <type_traits>
#include <vector>
+#include <glog/logging.h>
+
#include "kudu/clock/clock.h"
#include "kudu/common/partition.h"
#include "kudu/consensus/consensus.pb.h"
@@ -45,6 +47,7 @@
#include "kudu/tablet/transactions/alter_schema_transaction.h"
#include "kudu/tablet/transactions/transaction_driver.h"
#include "kudu/tablet/transactions/write_transaction.h"
+#include "kudu/util/logging.h"
#include "kudu/util/maintenance_manager.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/tablet_replica.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_replica.h b/src/kudu/tablet/tablet_replica.h
index 8b85889..6b90757 100644
--- a/src/kudu/tablet/tablet_replica.h
+++ b/src/kudu/tablet/tablet_replica.h
@@ -24,7 +24,6 @@
#include <string>
#include <vector>
-#include <glog/logging.h>
#include <gtest/gtest_prod.h>
#include "kudu/consensus/raft_consensus.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tablet/transactions/transaction_tracker-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/transactions/transaction_tracker-test.cc b/src/kudu/tablet/transactions/transaction_tracker-test.cc
index 4edb7e8..14d0e13 100644
--- a/src/kudu/tablet/transactions/transaction_tracker-test.cc
+++ b/src/kudu/tablet/transactions/transaction_tracker-test.cc
@@ -23,6 +23,7 @@
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
+#include <google/protobuf/message.h>
#include <gtest/gtest.h>
#include "kudu/consensus/consensus.pb.h"
@@ -43,12 +44,6 @@
#include "kudu/util/test_util.h"
#include "kudu/util/thread.h"
-namespace google {
-namespace protobuf {
-class Message;
-}
-}
-
DECLARE_int64(tablet_transaction_memory_limit_mb);
METRIC_DECLARE_entity(tablet);
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tools/tool_action.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action.cc b/src/kudu/tools/tool_action.cc
index 4d87909..80af0ce 100644
--- a/src/kudu/tools/tool_action.cc
+++ b/src/kudu/tools/tool_action.cc
@@ -24,7 +24,7 @@
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
#include <glog/logging.h>
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tools/tool_action_master.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_master.cc b/src/kudu/tools/tool_action_master.cc
index 064d9e6..611b36a 100644
--- a/src/kudu/tools/tool_action_master.cc
+++ b/src/kudu/tools/tool_action_master.cc
@@ -17,25 +17,30 @@
#include "kudu/tools/tool_action.h"
+#include <algorithm>
#include <iostream>
+#include <iterator>
#include <memory>
#include <string>
-#include <utility>
+#include <unordered_map>
+#include <vector>
#include <boost/algorithm/string/predicate.hpp>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
+#include "kudu/common/common.pb.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
+#include "kudu/gutil/strings/stringpiece.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/master/master.h"
#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
#include "kudu/tools/tool_action_common.h"
-#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
DECLARE_string(columns);
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tools/tool_action_tablet.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_tablet.cc b/src/kudu/tools/tool_action_tablet.cc
index 05be6f5..ff51462 100644
--- a/src/kudu/tools/tool_action_tablet.cc
+++ b/src/kudu/tools/tool_action_tablet.cc
@@ -18,7 +18,6 @@
#include "kudu/tools/tool_action.h"
#include <algorithm>
-#include <cstdint>
#include <fstream> // IWYU pragma: keep
#include <iostream>
#include <memory>
@@ -37,6 +36,7 @@
#include "kudu/consensus/consensus.proxy.h"
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid.pb.h"
+#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/split.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tools/tool_action_tserver.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_tserver.cc b/src/kudu/tools/tool_action_tserver.cc
index 7ef2b35..da7b7d0 100644
--- a/src/kudu/tools/tool_action_tserver.cc
+++ b/src/kudu/tools/tool_action_tserver.cc
@@ -17,26 +17,28 @@
#include "kudu/tools/tool_action.h"
-#include <functional>
#include <iostream>
#include <memory>
#include <string>
+#include <unordered_map>
#include <utility>
+#include <vector>
#include <boost/algorithm/string/predicate.hpp>
#include <gflags/gflags_declare.h>
+#include "kudu/common/common.pb.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
+#include "kudu/gutil/strings/stringpiece.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/master/master.h"
#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/tserver/tablet_server.h"
-#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
DECLARE_string(columns);
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/tserver/tablet_copy_source_session-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_source_session-test.cc b/src/kudu/tserver/tablet_copy_source_session-test.cc
index 85d9340..3bfb5d8 100644
--- a/src/kudu/tserver/tablet_copy_source_session-test.cc
+++ b/src/kudu/tserver/tablet_copy_source_session-test.cc
@@ -17,7 +17,6 @@
#include "kudu/tablet/tablet-test-util.h"
#include <algorithm>
-#include <cstddef>
#include <cstdint>
#include <memory>
#include <ostream>
@@ -49,7 +48,6 @@
#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/move.h"
-#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/fastmem.h"
#include "kudu/gutil/strings/substitute.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/util/compression/compression-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/compression/compression-test.cc b/src/kudu/util/compression/compression-test.cc
index 8d5374b..6b46a4f 100644
--- a/src/kudu/util/compression/compression-test.cc
+++ b/src/kudu/util/compression/compression-test.cc
@@ -20,14 +20,10 @@
#include <cstring>
#include <vector>
-#include <glog/logging.h>
#include <gtest/gtest.h>
-#include "kudu/cfile/cfile-test-base.h"
-#include "kudu/common/common.pb.h"
-#include "kudu/fs/block_id.h"
#include "kudu/gutil/gscoped_ptr.h"
-#include "kudu/gutil/move.h"
+#include "kudu/util/compression/compression.pb.h"
#include "kudu/util/compression/compression_codec.h"
#include "kudu/util/slice.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/f9a6a1b2/src/kudu/util/file_cache-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/file_cache-stress-test.cc b/src/kudu/util/file_cache-stress-test.cc
index 2960feb..bf150f5 100644
--- a/src/kudu/util/file_cache-stress-test.cc
+++ b/src/kudu/util/file_cache-stress-test.cc
@@ -17,32 +17,38 @@
#include "kudu/util/file_cache.h"
+#include <cstddef>
+#include <cstdint>
#include <deque>
#include <iterator>
#include <memory>
#include <mutex>
+#include <ostream>
#include <string>
#include <thread>
#include <unordered_map>
+#include <utility>
#include <vector>
#include <gflags/gflags.h>
#include <glog/logging.h>
#include <gtest/gtest.h>
+#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/env.h"
#include "kudu/util/file_cache-test-util.h"
#include "kudu/util/locks.h"
-#include "kudu/util/logging.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
#include "kudu/util/oid_generator.h"
#include "kudu/util/path_util.h"
#include "kudu/util/random.h"
+#include "kudu/util/slice.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/f9a6a1b2/src/kudu/util/subprocess.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/subprocess.cc b/src/kudu/util/subprocess.cc
index 3163161..8d01cbb 100644
--- a/src/kudu/util/subprocess.cc
+++ b/src/kudu/util/subprocess.cc
@@ -30,6 +30,7 @@
#include <cerrno>
#include <cstdint>
#include <cstdlib>
+#include <cstring>
#include <functional>
#include <memory>
#include <ostream>
@@ -49,6 +50,7 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/env.h"
#include "kudu/util/errno.h"
+#include "kudu/util/faststring.h"
#include "kudu/util/make_shared.h"
#include "kudu/util/monotime.h"
#include "kudu/util/path_util.h"