From 484898f61b244c3181da1a4de56bfbd4f63d7b7d Mon Sep 17 00:00:00 2001
From: Nicholas Ormrod <njormrod@meta.com>
Date: Thu, 20 Feb 2025 10:03:44 -0800
Subject: [PATCH] facebook-unused-include-check in fbcode/quic

Summary:
Remove headers flagged by facebook-unused-include-check over fbcode.quic.

+ format and autodeps

This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle.
You have been added as a reviewer by Sentinel or Butterfly.

Autodiff project: uiq
Autodiff partition: fbcode.quic
Autodiff bookmark: ad.uiq.fbcode.quic

Reviewed By: hanidamlaj

Differential Revision: D69864370

fbshipit-source-id: fb8f85599e1e12429f00dc2817dfc5ecf55bc482
---
 quic/api/QuicBatchWriterFactory.cpp                         | 1 -
 quic/api/test/IoBufQuicBatchTest.cpp                        | 1 -
 quic/api/test/QuicTransportTest.cpp                         | 2 --
 quic/client/state/ClientStateMachine.cpp                    | 1 -
 quic/client/test/ClientStateMachineTest.cpp                 | 1 -
 quic/codec/Decode.cpp                                       | 1 -
 quic/codec/QuicConnectionId.cpp                             | 2 --
 quic/codec/QuicHeaderCodec.cpp                              | 1 -
 quic/codec/test/QuicPacketBuilderTest.cpp                   | 1 -
 quic/codec/test/QuicPacketRebuilderTest.cpp                 | 3 ---
 quic/codec/test/TypesTest.cpp                               | 2 --
 quic/congestion_control/Bbr2.cpp                            | 1 -
 quic/congestion_control/BbrBandwidthSampler.cpp             | 1 -
 quic/congestion_control/CongestionControlFunctions.cpp      | 1 -
 quic/congestion_control/CongestionControllerFactory.cpp     | 1 -
 .../ServerCongestionControllerFactory.cpp                   | 1 -
 quic/congestion_control/test/Bbr2Test.cpp                   | 1 -
 .../test/StaticCwndCongestionControllerTest.cpp             | 1 -
 quic/dsr/frontend/test/PacketBuilderTest.cpp                | 3 ---
 quic/dsr/frontend/test/SchedulerTest.cpp                    | 1 -
 quic/dsr/frontend/test/WriteCodecTest.cpp                   | 2 --
 quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp | 5 -----
 quic/loss/test/QuicLossFunctionsTest.cpp                    | 1 -
 quic/server/QuicServerTransport.cpp                         | 1 -
 quic/server/async_tran/QuicAsyncTransportServer.cpp         | 2 --
 .../server/async_tran/test/QuicAsyncTransportServerTest.cpp | 2 --
 quic/server/handshake/ServerHandshake.cpp                   | 1 -
 quic/server/handshake/test/AppTokenTest.cpp                 | 1 -
 quic/server/handshake/test/ServerHandshakeTest.cpp          | 6 ------
 quic/server/test/QuicServerTest.cpp                         | 3 ---
 quic/server/test/QuicServerTransportTest.cpp                | 1 -
 quic/state/PendingPathRateLimiter.cpp                       | 2 --
 quic/state/QuicStreamFunctions.cpp                          | 3 ---
 quic/state/test/AckHandlersTest.cpp                         | 1 -
 quic/state/test/OutstandingPacketTest.cpp                   | 3 ---
 quic/state/test/QuicStreamFunctionsTest.cpp                 | 1 -
 36 files changed, 62 deletions(-)

diff --git a/quic/api/QuicBatchWriterFactory.cpp b/quic/api/QuicBatchWriterFactory.cpp
index 6a559026e..cd70d5502 100644
--- a/quic/api/QuicBatchWriterFactory.cpp
+++ b/quic/api/QuicBatchWriterFactory.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <quic/api/QuicBatchWriterFactory.h>
-#include <quic/common/events/QuicEventBase.h>
 
 namespace quic {
 
diff --git a/quic/api/test/IoBufQuicBatchTest.cpp b/quic/api/test/IoBufQuicBatchTest.cpp
index 93d97e6d0..b7360c76e 100644
--- a/quic/api/test/IoBufQuicBatchTest.cpp
+++ b/quic/api/test/IoBufQuicBatchTest.cpp
@@ -13,7 +13,6 @@
 #include <quic/common/test/TestUtils.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
-#include <quic/state/StateData.h>
 
 constexpr const auto kNumLoops = 64;
 constexpr const auto kMaxBufs = 10;
diff --git a/quic/api/test/QuicTransportTest.cpp b/quic/api/test/QuicTransportTest.cpp
index 431d303f1..504bebf84 100644
--- a/quic/api/test/QuicTransportTest.cpp
+++ b/quic/api/test/QuicTransportTest.cpp
@@ -21,8 +21,6 @@
 #include <quic/common/testutil/MockAsyncUDPSocket.h>
 #include <quic/congestion_control/EcnL4sTracker.h>
 #include <quic/congestion_control/StaticCwndCongestionController.h>
-#include <quic/dsr/Types.h>
-#include <quic/dsr/test/Mocks.h>
 #include <quic/handshake/test/Mocks.h>
 #include <quic/logging/test/Mocks.h>
 #include <quic/server/state/ServerStateMachine.h>
diff --git a/quic/client/state/ClientStateMachine.cpp b/quic/client/state/ClientStateMachine.cpp
index a2c30060c..177b15d65 100644
--- a/quic/client/state/ClientStateMachine.cpp
+++ b/quic/client/state/ClientStateMachine.cpp
@@ -14,7 +14,6 @@
 #include <quic/codec/Decode.h>
 #include <quic/common/TimeUtil.h>
 #include <quic/congestion_control/CongestionControllerFactory.h>
-#include <quic/congestion_control/QuicCubic.h>
 #include <quic/flowcontrol/QuicFlowController.h>
 #include <quic/handshake/TransportParameters.h>
 #include <quic/state/QuicStateFunctions.h>
diff --git a/quic/client/test/ClientStateMachineTest.cpp b/quic/client/test/ClientStateMachineTest.cpp
index ea47b1dba..4d81b8e18 100644
--- a/quic/client/test/ClientStateMachineTest.cpp
+++ b/quic/client/test/ClientStateMachineTest.cpp
@@ -14,7 +14,6 @@
 #include <quic/common/events/FollyQuicEventBase.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
-#include <quic/handshake/CryptoFactory.h>
 #include <quic/handshake/TransportParameters.h>
 
 using namespace ::testing;
diff --git a/quic/codec/Decode.cpp b/quic/codec/Decode.cpp
index 6276d2c48..dd07328ba 100644
--- a/quic/codec/Decode.cpp
+++ b/quic/codec/Decode.cpp
@@ -7,7 +7,6 @@
 
 #include <quic/codec/Decode.h>
 
-#include <folly/String.h>
 #include <quic/QuicConstants.h>
 #include <quic/QuicException.h>
 #include <quic/codec/PacketNumber.h>
diff --git a/quic/codec/QuicConnectionId.cpp b/quic/codec/QuicConnectionId.cpp
index f4549e234..cb5940ab9 100644
--- a/quic/codec/QuicConnectionId.cpp
+++ b/quic/codec/QuicConnectionId.cpp
@@ -7,8 +7,6 @@
 
 #include <quic/codec/QuicConnectionId.h>
 
-#include <quic/QuicConstants.h>
-
 #include <folly/Random.h>
 #include <glog/logging.h>
 
diff --git a/quic/codec/QuicHeaderCodec.cpp b/quic/codec/QuicHeaderCodec.cpp
index de7ca167e..6a4c4ae08 100644
--- a/quic/codec/QuicHeaderCodec.cpp
+++ b/quic/codec/QuicHeaderCodec.cpp
@@ -7,7 +7,6 @@
 
 #include <quic/codec/QuicHeaderCodec.h>
 
-#include <quic/QuicException.h>
 #include <quic/codec/Decode.h>
 
 namespace quic {
diff --git a/quic/codec/test/QuicPacketBuilderTest.cpp b/quic/codec/test/QuicPacketBuilderTest.cpp
index 95dd79950..e4cc45050 100644
--- a/quic/codec/test/QuicPacketBuilderTest.cpp
+++ b/quic/codec/test/QuicPacketBuilderTest.cpp
@@ -17,7 +17,6 @@
 #include <quic/common/test/TestUtils.h>
 #include <quic/fizz/handshake/FizzCryptoFactory.h>
 #include <quic/fizz/handshake/FizzRetryIntegrityTagGenerator.h>
-#include <quic/handshake/HandshakeLayer.h>
 
 using namespace quic;
 using namespace quic::test;
diff --git a/quic/codec/test/QuicPacketRebuilderTest.cpp b/quic/codec/test/QuicPacketRebuilderTest.cpp
index 734a8edea..1dcf49522 100644
--- a/quic/codec/test/QuicPacketRebuilderTest.cpp
+++ b/quic/codec/test/QuicPacketRebuilderTest.cpp
@@ -14,11 +14,8 @@
 #include <quic/common/test/TestUtils.h>
 #include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
 #include <quic/server/state/ServerStateMachine.h>
-#include <quic/state/QuicStateFunctions.h>
-#include <quic/state/QuicStreamFunctions.h>
 #include <quic/state/StateData.h>
 #include <quic/state/stream/StreamSendHandlers.h>
-#include <quic/state/stream/StreamStateFunctions.h>
 
 using namespace testing;
 
diff --git a/quic/codec/test/TypesTest.cpp b/quic/codec/test/TypesTest.cpp
index c3aabf067..e276eb1ff 100644
--- a/quic/codec/test/TypesTest.cpp
+++ b/quic/codec/test/TypesTest.cpp
@@ -7,11 +7,9 @@
 
 #include <quic/codec/Types.h>
 
-#include <folly/String.h>
 #include <folly/container/Array.h>
 #include <folly/io/IOBuf.h>
 #include <folly/portability/GTest.h>
-#include <quic/QuicException.h>
 #include <quic/codec/Decode.h>
 #include <quic/common/test/TestUtils.h>
 
diff --git a/quic/congestion_control/Bbr2.cpp b/quic/congestion_control/Bbr2.cpp
index 369364871..ce55e1444 100644
--- a/quic/congestion_control/Bbr2.cpp
+++ b/quic/congestion_control/Bbr2.cpp
@@ -8,7 +8,6 @@
 #include <quic/congestion_control/Bbr2.h>
 
 #include <quic/congestion_control/CongestionControlFunctions.h>
-#include <sys/types.h>
 #include <chrono>
 #include <cstdint>
 #include <limits>
diff --git a/quic/congestion_control/BbrBandwidthSampler.cpp b/quic/congestion_control/BbrBandwidthSampler.cpp
index 867e42e2f..61352924d 100644
--- a/quic/congestion_control/BbrBandwidthSampler.cpp
+++ b/quic/congestion_control/BbrBandwidthSampler.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <quic/congestion_control/BbrBandwidthSampler.h>
-#include <quic/logging/QLoggerConstants.h>
 
 namespace quic {
 
diff --git a/quic/congestion_control/CongestionControlFunctions.cpp b/quic/congestion_control/CongestionControlFunctions.cpp
index 24ad67990..82b1ee5aa 100644
--- a/quic/congestion_control/CongestionControlFunctions.cpp
+++ b/quic/congestion_control/CongestionControlFunctions.cpp
@@ -7,7 +7,6 @@
 
 #include <quic/congestion_control/CongestionControlFunctions.h>
 
-#include <quic/QuicConstants.h>
 #include <quic/common/TimeUtil.h>
 #include <algorithm>
 
diff --git a/quic/congestion_control/CongestionControllerFactory.cpp b/quic/congestion_control/CongestionControllerFactory.cpp
index 0a06a620b..2dc5c97c7 100644
--- a/quic/congestion_control/CongestionControllerFactory.cpp
+++ b/quic/congestion_control/CongestionControllerFactory.cpp
@@ -15,7 +15,6 @@
 #include <quic/congestion_control/Copa2.h>
 #include <quic/congestion_control/NewReno.h>
 #include <quic/congestion_control/QuicCubic.h>
-#include <quic/congestion_control/StaticCwndCongestionController.h>
 
 #include <memory>
 
diff --git a/quic/congestion_control/ServerCongestionControllerFactory.cpp b/quic/congestion_control/ServerCongestionControllerFactory.cpp
index d44615eef..b73abef81 100644
--- a/quic/congestion_control/ServerCongestionControllerFactory.cpp
+++ b/quic/congestion_control/ServerCongestionControllerFactory.cpp
@@ -16,7 +16,6 @@
 #include <quic/congestion_control/Copa2.h>
 #include <quic/congestion_control/NewReno.h>
 #include <quic/congestion_control/QuicCubic.h>
-#include <quic/congestion_control/StaticCwndCongestionController.h>
 
 #include <memory>
 
diff --git a/quic/congestion_control/test/Bbr2Test.cpp b/quic/congestion_control/test/Bbr2Test.cpp
index 358f86c26..7a6d8bc58 100644
--- a/quic/congestion_control/test/Bbr2Test.cpp
+++ b/quic/congestion_control/test/Bbr2Test.cpp
@@ -10,7 +10,6 @@
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 #include <quic/common/test/TestUtils.h>
-#include <quic/congestion_control/test/Mocks.h>
 #include <quic/state/test/Mocks.h>
 
 using namespace testing;
diff --git a/quic/congestion_control/test/StaticCwndCongestionControllerTest.cpp b/quic/congestion_control/test/StaticCwndCongestionControllerTest.cpp
index 1f26829c2..aa338858b 100644
--- a/quic/congestion_control/test/StaticCwndCongestionControllerTest.cpp
+++ b/quic/congestion_control/test/StaticCwndCongestionControllerTest.cpp
@@ -11,7 +11,6 @@
 #include <folly/portability/GTest.h>
 #include <quic/common/test/TestUtils.h>
 #include <quic/congestion_control/StaticCwndCongestionController.h>
-#include <quic/congestion_control/test/Mocks.h>
 #include <quic/state/test/Mocks.h>
 
 using namespace testing;
diff --git a/quic/dsr/frontend/test/PacketBuilderTest.cpp b/quic/dsr/frontend/test/PacketBuilderTest.cpp
index a49b97d5b..e2822ea0b 100644
--- a/quic/dsr/frontend/test/PacketBuilderTest.cpp
+++ b/quic/dsr/frontend/test/PacketBuilderTest.cpp
@@ -10,9 +10,6 @@
 #include <quic/dsr/Types.h>
 #include <quic/dsr/frontend/PacketBuilder.h>
 #include <quic/dsr/test/TestCommon.h>
-#include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
-#include <quic/handshake/test/Mocks.h>
-#include <quic/server/state/ServerStateMachine.h>
 
 namespace quic::test {
 
diff --git a/quic/dsr/frontend/test/SchedulerTest.cpp b/quic/dsr/frontend/test/SchedulerTest.cpp
index 9aceeac10..7ebc2cc14 100644
--- a/quic/dsr/frontend/test/SchedulerTest.cpp
+++ b/quic/dsr/frontend/test/SchedulerTest.cpp
@@ -10,7 +10,6 @@
 #include <quic/dsr/frontend/test/Mocks.h>
 #include <quic/dsr/test/Mocks.h>
 #include <quic/dsr/test/TestCommon.h>
-#include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
 #include <quic/server/state/ServerStateMachine.h>
 
 using namespace testing;
diff --git a/quic/dsr/frontend/test/WriteCodecTest.cpp b/quic/dsr/frontend/test/WriteCodecTest.cpp
index 4dffb7e5f..45480c0cb 100644
--- a/quic/dsr/frontend/test/WriteCodecTest.cpp
+++ b/quic/dsr/frontend/test/WriteCodecTest.cpp
@@ -12,8 +12,6 @@
 #include <quic/common/test/TestUtils.h>
 #include <quic/dsr/frontend/test/Mocks.h>
 #include <quic/dsr/test/TestCommon.h>
-#include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
-#include <quic/handshake/test/Mocks.h>
 #include <quic/server/state/ServerStateMachine.h>
 
 using namespace testing;
diff --git a/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp b/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp
index 03890e5c6..3e45e2369 100644
--- a/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp
+++ b/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp
@@ -10,9 +10,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <condition_variable>
-#include <mutex>
-
 #include <fizz/backend/openssl/OpenSSL.h>
 #include <fizz/client/test/Mocks.h>
 #include <fizz/crypto/test/TestUtil.h>
@@ -23,7 +20,6 @@
 
 #include <folly/io/async/SSLContext.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
-#include <folly/io/async/test/MockAsyncTransport.h>
 
 #include <quic/client/handshake/ClientTransportParametersExtension.h>
 #include <quic/client/state/ClientStateMachine.h>
@@ -33,7 +29,6 @@
 #include <quic/fizz/client/handshake/test/MockQuicPskCache.h>
 #include <quic/fizz/handshake/FizzBridge.h>
 #include <quic/fizz/handshake/QuicFizzFactory.h>
-#include <quic/state/QuicStreamFunctions.h>
 #include <quic/state/StateData.h>
 
 using namespace testing;
diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp
index edc21fd6f..f794d53ca 100644
--- a/quic/loss/test/QuicLossFunctionsTest.cpp
+++ b/quic/loss/test/QuicLossFunctionsTest.cpp
@@ -19,7 +19,6 @@
 #include <quic/common/events/FollyQuicEventBase.h>
 #include <quic/common/test/TestUtils.h>
 #include <quic/common/testutil/MockAsyncUDPSocket.h>
-#include <quic/dsr/Types.h>
 #include <quic/dsr/test/Mocks.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
 #include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
diff --git a/quic/server/QuicServerTransport.cpp b/quic/server/QuicServerTransport.cpp
index afbdf673d..1349ea05a 100644
--- a/quic/server/QuicServerTransport.cpp
+++ b/quic/server/QuicServerTransport.cpp
@@ -12,7 +12,6 @@
 #include <quic/server/QuicServerTransport.h>
 #include <quic/server/handshake/AppToken.h>
 #include <quic/server/handshake/DefaultAppTokenValidator.h>
-#include <quic/server/handshake/StatelessResetGenerator.h>
 #include <quic/state/QuicStreamUtilities.h>
 #include <quic/state/TransportSettingsFunctions.h>
 
diff --git a/quic/server/async_tran/QuicAsyncTransportServer.cpp b/quic/server/async_tran/QuicAsyncTransportServer.cpp
index b5eaa665a..57f6209e2 100644
--- a/quic/server/async_tran/QuicAsyncTransportServer.cpp
+++ b/quic/server/async_tran/QuicAsyncTransportServer.cpp
@@ -7,8 +7,6 @@
 
 #include <quic/server/async_tran/QuicAsyncTransportServer.h>
 
-#include <quic/server/QuicServerTransport.h>
-
 namespace quic {
 
 QuicAsyncTransportServer::QuicAsyncTransportServer(
diff --git a/quic/server/async_tran/test/QuicAsyncTransportServerTest.cpp b/quic/server/async_tran/test/QuicAsyncTransportServerTest.cpp
index 57fee7b1a..fa30a1a54 100644
--- a/quic/server/async_tran/test/QuicAsyncTransportServerTest.cpp
+++ b/quic/server/async_tran/test/QuicAsyncTransportServerTest.cpp
@@ -19,9 +19,7 @@
 #include <quic/fizz/client/handshake/FizzClientHandshake.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
 #include <quic/server/QuicServer.h>
-#include <quic/server/QuicServerTransport.h>
 #include <quic/server/async_tran/QuicAsyncTransportServer.h>
-#include <quic/server/async_tran/QuicServerAsyncTransport.h>
 #include <quic/server/test/Mocks.h>
 
 using namespace testing;
diff --git a/quic/server/handshake/ServerHandshake.cpp b/quic/server/handshake/ServerHandshake.cpp
index 251750031..39d62ec3e 100644
--- a/quic/server/handshake/ServerHandshake.cpp
+++ b/quic/server/handshake/ServerHandshake.cpp
@@ -8,7 +8,6 @@
 #include <quic/server/handshake/ServerHandshake.h>
 
 #include <quic/fizz/handshake/FizzBridge.h>
-#include <quic/fizz/handshake/FizzCryptoFactory.h>
 #include <quic/state/QuicStreamFunctions.h>
 #include <cstdint>
 
diff --git a/quic/server/handshake/test/AppTokenTest.cpp b/quic/server/handshake/test/AppTokenTest.cpp
index cd18901ab..c33c7ded1 100644
--- a/quic/server/handshake/test/AppTokenTest.cpp
+++ b/quic/server/handshake/test/AppTokenTest.cpp
@@ -10,7 +10,6 @@
 #include <quic/QuicConstants.h>
 #include <quic/server/state/ServerStateMachine.h>
 
-#include <fizz/server/ResumptionState.h>
 #include <quic/common/Optional.h>
 
 #include <gtest/gtest.h>
diff --git a/quic/server/handshake/test/ServerHandshakeTest.cpp b/quic/server/handshake/test/ServerHandshakeTest.cpp
index f479b572c..d23876148 100644
--- a/quic/server/handshake/test/ServerHandshakeTest.cpp
+++ b/quic/server/handshake/test/ServerHandshakeTest.cpp
@@ -8,18 +8,13 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <condition_variable>
-#include <mutex>
-
 #include <fizz/client/test/Mocks.h>
 #include <fizz/crypto/test/TestUtil.h>
-#include <fizz/protocol/clock/test/Mocks.h>
 #include <fizz/protocol/test/Mocks.h>
 #include <fizz/server/test/Mocks.h>
 
 #include <folly/io/async/SSLContext.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
-#include <folly/io/async/test/MockAsyncTransport.h>
 
 #include <quic/QuicConstants.h>
 #include <quic/common/test/TestUtils.h>
@@ -29,7 +24,6 @@
 #include <quic/fizz/server/handshake/AppToken.h>
 #include <quic/fizz/server/handshake/FizzServerHandshake.h>
 #include <quic/fizz/server/handshake/FizzServerQuicHandshakeContext.h>
-#include <quic/handshake/HandshakeLayer.h>
 #include <quic/server/handshake/AppToken.h>
 #include <quic/server/handshake/ServerHandshake.h>
 #include <quic/state/StateData.h>
diff --git a/quic/server/test/QuicServerTest.cpp b/quic/server/test/QuicServerTest.cpp
index 9ed108538..f5140f4a1 100644
--- a/quic/server/test/QuicServerTest.cpp
+++ b/quic/server/test/QuicServerTest.cpp
@@ -20,15 +20,12 @@
 #include <quic/codec/QuicHeaderCodec.h>
 #include <quic/codec/test/Mocks.h>
 #include <quic/common/events/FollyQuicEventBase.h>
-#include <quic/common/test/TestClientUtils.h>
 #include <quic/common/test/TestUtils.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/congestion_control/ServerCongestionControllerFactory.h>
-#include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
 #include <quic/fizz/handshake/FizzCryptoFactory.h>
 #include <quic/server/AcceptObserver.h>
 #include <quic/server/SlidingWindowRateLimiter.h>
-#include <quic/server/handshake/StatelessResetGenerator.h>
 #include <quic/server/handshake/TokenGenerator.h>
 #include <quic/server/test/Mocks.h>
 #include <quic/state/test/MockQuicStats.h>
diff --git a/quic/server/test/QuicServerTransportTest.cpp b/quic/server/test/QuicServerTransportTest.cpp
index d081b7847..33286f989 100644
--- a/quic/server/test/QuicServerTransportTest.cpp
+++ b/quic/server/test/QuicServerTransportTest.cpp
@@ -12,7 +12,6 @@
 #include <quic/dsr/Types.h>
 #include <quic/dsr/test/Mocks.h>
 #include <quic/fizz/handshake/FizzCryptoFactory.h>
-#include <quic/fizz/server/handshake/FizzServerHandshake.h>
 #include <quic/logging/FileQLogger.h>
 #include <quic/server/handshake/ServerHandshake.h>
 #include <quic/state/QuicStreamFunctions.h>
diff --git a/quic/state/PendingPathRateLimiter.cpp b/quic/state/PendingPathRateLimiter.cpp
index 48084517e..d922d724d 100644
--- a/quic/state/PendingPathRateLimiter.cpp
+++ b/quic/state/PendingPathRateLimiter.cpp
@@ -7,8 +7,6 @@
 
 #include <quic/state/PendingPathRateLimiter.h>
 
-#include <glog/logging.h>
-
 namespace quic {
 
 void PendingPathRateLimiter::onPacketSent(uint64_t sentBytes) {
diff --git a/quic/state/QuicStreamFunctions.cpp b/quic/state/QuicStreamFunctions.cpp
index 01b469043..d7fab988a 100644
--- a/quic/state/QuicStreamFunctions.cpp
+++ b/quic/state/QuicStreamFunctions.cpp
@@ -10,9 +10,6 @@
 #include <quic/QuicException.h>
 #include <quic/flowcontrol/QuicFlowController.h>
 
-#include <quic/state/QuicStreamUtilities.h>
-
-#include <folly/io/Cursor.h>
 #include <algorithm>
 
 namespace {
diff --git a/quic/state/test/AckHandlersTest.cpp b/quic/state/test/AckHandlersTest.cpp
index c79649cd9..389776ce8 100644
--- a/quic/state/test/AckHandlersTest.cpp
+++ b/quic/state/test/AckHandlersTest.cpp
@@ -21,7 +21,6 @@
 #include <quic/state/stream/StreamSendHandlers.h>
 #include <quic/state/test/AckEventTestUtil.h>
 #include <quic/state/test/Mocks.h>
-#include <sys/types.h>
 
 #include <numeric>
 
diff --git a/quic/state/test/OutstandingPacketTest.cpp b/quic/state/test/OutstandingPacketTest.cpp
index 90c88eb2b..450b853c8 100644
--- a/quic/state/test/OutstandingPacketTest.cpp
+++ b/quic/state/test/OutstandingPacketTest.cpp
@@ -12,13 +12,10 @@
 #include <quic/api/test/MockQuicSocket.h>
 #include <quic/api/test/Mocks.h>
 #include <quic/common/test/TestUtils.h>
-#include <quic/logging/test/Mocks.h>
 #include <quic/state/OutstandingPacket.h>
-#include <quic/state/stream/StreamSendHandlers.h>
 #include <quic/state/test/Mocks.h>
 
 #include <memory>
-#include <numeric>
 using namespace testing;
 
 namespace quic::test {
diff --git a/quic/state/test/QuicStreamFunctionsTest.cpp b/quic/state/test/QuicStreamFunctionsTest.cpp
index 9d3ad8f59..7c5f80b44 100644
--- a/quic/state/test/QuicStreamFunctionsTest.cpp
+++ b/quic/state/test/QuicStreamFunctionsTest.cpp
@@ -10,7 +10,6 @@
 #include <quic/state/QuicStreamUtilities.h>
 
 #include <quic/state/QuicStreamFunctions.h>
-#include <quic/state/QuicStreamUtilities.h>
 
 #include <quic/client/state/ClientStateMachine.h>
 #include <quic/common/test/TestUtils.h>