diff --git a/verible/verilog/formatting/formatter-test-utils.h b/verible/verilog/formatting/formatter-test-utils.h
index d0eb424..0be6382 100644
--- a/verible/verilog/formatting/formatter-test-utils.h
+++ b/verible/verilog/formatting/formatter-test-utils.h
@@ -18,7 +18,6 @@
 #ifndef VERIBLE_VERILOG_FORMATTING_FORMATTER_TEST_UTILS_H_
 #define VERIBLE_VERILOG_FORMATTING_FORMATTER_TEST_UTILS_H_
 
-#include <cstddef>
 #include <sstream>
 #include <string_view>
 
diff --git a/verible/verilog/formatting/formatter_align_test.cc b/verible/verilog/formatting/formatter_align_test.cc
index 6c2eb7b..affb5a7 100644
--- a/verible/verilog/formatting/formatter_align_test.cc
+++ b/verible/verilog/formatting/formatter_align_test.cc
@@ -20,7 +20,6 @@
 
 #include "gtest/gtest.h"
 #include "verible/common/formatting/align.h"
-#include "verible/common/formatting/basic-format-style.h"
 #include "verible/common/util/logging.h"
 #include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
diff --git a/verible/verilog/formatting/formatter_class_package_test.cc b/verible/verilog/formatting/formatter_class_package_test.cc
index 55fa226..0c5e067 100644
--- a/verible/verilog/formatting/formatter_class_package_test.cc
+++ b/verible/verilog/formatting/formatter_class_package_test.cc
@@ -15,13 +15,8 @@
 // Test cases in this file should be *insensitive* to wrapping penalties.
 // Penalty-sensitive tests belong in formatter-tuning_test.cc.
 
-#include <sstream>
-#include <string_view>
-
 #include "gtest/gtest.h"
-#include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
-#include "verible/verilog/formatting/formatter.h"
 
 namespace verilog {
 namespace formatter {
diff --git a/verible/verilog/formatting/formatter_disable_test.cc b/verible/verilog/formatting/formatter_disable_test.cc
index c539107..b653063 100644
--- a/verible/verilog/formatting/formatter_disable_test.cc
+++ b/verible/verilog/formatting/formatter_disable_test.cc
@@ -15,13 +15,8 @@
 // Test cases in this file should be *insensitive* to wrapping penalties.
 // Penalty-sensitive tests belong in formatter-tuning_test.cc.
 
-#include <sstream>
-#include <string_view>
-
 #include "gtest/gtest.h"
-#include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
-#include "verible/verilog/formatting/formatter.h"
 
 namespace verilog {
 namespace formatter {
diff --git a/verible/verilog/formatting/formatter_function_task_test.cc b/verible/verilog/formatting/formatter_function_task_test.cc
index b5e1565..88e30bb 100644
--- a/verible/verilog/formatting/formatter_function_task_test.cc
+++ b/verible/verilog/formatting/formatter_function_task_test.cc
@@ -15,13 +15,8 @@
 // Test cases in this file should be *insensitive* to wrapping penalties.
 // Penalty-sensitive tests belong in formatter-tuning_test.cc.
 
-#include <sstream>
-#include <string_view>
-
 #include "gtest/gtest.h"
-#include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
-#include "verible/verilog/formatting/formatter.h"
 
 namespace verilog {
 namespace formatter {
diff --git a/verible/verilog/formatting/formatter_issue_regression_test.cc b/verible/verilog/formatting/formatter_issue_regression_test.cc
index 3c98d4e..8f1fcef 100644
--- a/verible/verilog/formatting/formatter_issue_regression_test.cc
+++ b/verible/verilog/formatting/formatter_issue_regression_test.cc
@@ -29,8 +29,6 @@
 namespace formatter {
 namespace {
 
-using testing::HasSubstr;
-
 // Regression for https://github.com/chipsalliance/verible/issues/2547:
 // A localparam initialized to a sum of long macros must converge: infix `+`
 // stays with the following operand so re-format does not oscillate between
diff --git a/verible/verilog/formatting/formatter_macro_test.cc b/verible/verilog/formatting/formatter_macro_test.cc
index 9b98660..25f4b90 100644
--- a/verible/verilog/formatting/formatter_macro_test.cc
+++ b/verible/verilog/formatting/formatter_macro_test.cc
@@ -15,13 +15,8 @@
 // Test cases in this file should be *insensitive* to wrapping penalties.
 // Penalty-sensitive tests belong in formatter-tuning_test.cc.
 
-#include <sstream>
-#include <string_view>
-
 #include "gtest/gtest.h"
-#include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
-#include "verible/verilog/formatting/formatter.h"
 
 namespace verilog {
 namespace formatter {
diff --git a/verible/verilog/formatting/formatter_module_test.cc b/verible/verilog/formatting/formatter_module_test.cc
index 1f827f1..4290e5e 100644
--- a/verible/verilog/formatting/formatter_module_test.cc
+++ b/verible/verilog/formatting/formatter_module_test.cc
@@ -15,13 +15,8 @@
 // Test cases in this file should be *insensitive* to wrapping penalties.
 // Penalty-sensitive tests belong in formatter-tuning_test.cc.
 
-#include <sstream>
-#include <string_view>
-
 #include "gtest/gtest.h"
-#include "verible/verilog/formatting/format-style.h"
 #include "verible/verilog/formatting/formatter-test-utils.h"
-#include "verible/verilog/formatting/formatter.h"
 
 namespace verilog {
 namespace formatter {
diff --git a/verible/verilog/formatting/formatter_wrap_style_test.cc b/verible/verilog/formatting/formatter_wrap_style_test.cc
index 4b3e3af..b61fe42 100644
--- a/verible/verilog/formatting/formatter_wrap_style_test.cc
+++ b/verible/verilog/formatting/formatter_wrap_style_test.cc
@@ -17,7 +17,6 @@
 
 #include <cctype>
 #include <cstddef>
-#include <memory>
 #include <sstream>
 #include <string>
 #include <string_view>