IWYU net/dcsctp and use C++ headers
using
find net -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner
followed by
tools_webrtc/gn_check_autofix.py -C out/Default/
followed by running clang-tidy with
tools/clang/scripts/build_clang_tools_extra.py \
--fetch out/Default clang-tidy clang-apply-replacements
ninja -C out/Default
gn gen out/Default --export-compile-commands
cd out/Default
tools/clang/third_party/llvm/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -p . \
-clang-tidy-binary out/Default/tools/clang/third_party/llvm/build/bin/clang-tidy \
-clang-apply-replacements-binary \
out/Default/tools/clang/third_party/llvm/build/bin/clang-apply-replacements \
-checks='-*,modernize-deprecated-headers' \
-fix
to move from C style standard headers to C++ style variants followed by
git cl format
Bug: webrtc:42226242
Change-Id: I225601898c5eaddda9d85aae360e50169386f7e9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/392040
Reviewed-by: Victor Boivie <boivie@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#44875}
diff --git a/net/dcsctp/packet/BUILD.gn b/net/dcsctp/packet/BUILD.gn
index dcdff08..f1ab075 100644
--- a/net/dcsctp/packet/BUILD.gn
+++ b/net/dcsctp/packet/BUILD.gn
@@ -159,8 +159,10 @@
"../../../rtc_base:checks",
"../../../rtc_base:logging",
"../../../rtc_base:stringutils",
+ "../common:internal_types",
"../common:math",
"../packet:bounded_io",
+ "../public:types",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/strings:string_view",
]
diff --git a/net/dcsctp/packet/chunk/abort_chunk.cc b/net/dcsctp/packet/chunk/abort_chunk.cc
index d7190a7..42840d3 100644
--- a/net/dcsctp/packet/chunk/abort_chunk.cc
+++ b/net/dcsctp/packet/chunk/abort_chunk.cc
@@ -9,17 +9,16 @@
*/
#include "net/dcsctp/packet/chunk/abort_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/error_cause/error_cause.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/abort_chunk_test.cc b/net/dcsctp/packet/chunk/abort_chunk_test.cc
index c1f3a4d..ac471d8 100644
--- a/net/dcsctp/packet/chunk/abort_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/abort_chunk_test.cc
@@ -9,16 +9,13 @@
*/
#include "net/dcsctp/packet/chunk/abort_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
-#include "net/dcsctp/packet/error_cause/error_cause.h"
#include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/cookie_ack_chunk.cc b/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
index c484620..194bbca 100644
--- a/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/cookie_ack_chunk.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/chunk/cookie_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/chunk/cookie_ack_chunk_test.cc b/net/dcsctp/packet/chunk/cookie_ack_chunk_test.cc
index 3f560c6..05e0077 100644
--- a/net/dcsctp/packet/chunk/cookie_ack_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/cookie_ack_chunk_test.cc
@@ -9,14 +9,11 @@
*/
#include "net/dcsctp/packet/chunk/cookie_ack_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/cookie_echo_chunk.cc b/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
index daa8562..580e15d 100644
--- a/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
+++ b/net/dcsctp/packet/chunk/cookie_echo_chunk.cc
@@ -9,16 +9,14 @@
*/
#include "net/dcsctp/packet/chunk/cookie_echo_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/cookie_echo_chunk_test.cc b/net/dcsctp/packet/chunk/cookie_echo_chunk_test.cc
index d06e0a6..9f3f24c 100644
--- a/net/dcsctp/packet/chunk/cookie_echo_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/cookie_echo_chunk_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/chunk/cookie_echo_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/data_chunk.cc b/net/dcsctp/packet/chunk/data_chunk.cc
index 229ba0c..2f242ba 100644
--- a/net/dcsctp/packet/chunk/data_chunk.cc
+++ b/net/dcsctp/packet/chunk/data_chunk.cc
@@ -9,17 +9,18 @@
*/
#include "net/dcsctp/packet/chunk/data_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/data_common.h"
+#include "net/dcsctp/packet/data.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/error_chunk.cc b/net/dcsctp/packet/chunk/error_chunk.cc
index 67a439e..7d445b3 100644
--- a/net/dcsctp/packet/chunk/error_chunk.cc
+++ b/net/dcsctp/packet/chunk/error_chunk.cc
@@ -9,17 +9,16 @@
*/
#include "net/dcsctp/packet/chunk/error_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/error_cause/error_cause.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
index f9cf67e..59c9ed3 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
+++ b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc
@@ -9,19 +9,19 @@
*/
#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/forward_tsn_chunk_test.cc b/net/dcsctp/packet/chunk/forward_tsn_chunk_test.cc
index 51f97f2..982e7ce 100644
--- a/net/dcsctp/packet/chunk/forward_tsn_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/forward_tsn_chunk_test.cc
@@ -9,16 +9,16 @@
*/
#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
+#include "net/dcsctp/public/types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
index 68855bc..0d86ed3 100644
--- a/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_ack_chunk.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <utility>
#include <vector>
@@ -19,7 +19,6 @@
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/parameter/parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/heartbeat_ack_chunk_test.cc b/net/dcsctp/packet/chunk/heartbeat_ack_chunk_test.cc
index e4d0dd1..6e41e7b 100644
--- a/net/dcsctp/packet/chunk/heartbeat_ack_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_ack_chunk_test.cc
@@ -9,8 +9,7 @@
*/
#include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <utility>
#include <vector>
@@ -18,8 +17,8 @@
#include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h"
#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc b/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
index dd8f3e8..6efb7e0 100644
--- a/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_request_chunk.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <utility>
#include <vector>
@@ -19,7 +19,6 @@
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/parameter/parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/heartbeat_request_chunk_test.cc b/net/dcsctp/packet/chunk/heartbeat_request_chunk_test.cc
index 94911fe..ab50025 100644
--- a/net/dcsctp/packet/chunk/heartbeat_request_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/heartbeat_request_chunk_test.cc
@@ -9,8 +9,7 @@
*/
#include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <utility>
#include <vector>
@@ -18,8 +17,8 @@
#include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h"
#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/idata_chunk.cc b/net/dcsctp/packet/chunk/idata_chunk.cc
index e084dc3..2d38f97 100644
--- a/net/dcsctp/packet/chunk/idata_chunk.cc
+++ b/net/dcsctp/packet/chunk/idata_chunk.cc
@@ -9,17 +9,18 @@
*/
#include "net/dcsctp/packet/chunk/idata_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/data_common.h"
+#include "net/dcsctp/packet/data.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
index 19f5780..b454420 100644
--- a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
+++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc
@@ -9,19 +9,20 @@
*/
#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/public/types.h"
+#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk_test.cc b/net/dcsctp/packet/chunk/iforward_tsn_chunk_test.cc
index 6a89433..d7f3479 100644
--- a/net/dcsctp/packet/chunk/iforward_tsn_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk_test.cc
@@ -9,16 +9,16 @@
*/
#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
+#include "net/dcsctp/public/types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/init_ack_chunk.cc b/net/dcsctp/packet/chunk/init_ack_chunk.cc
index 5b6a03c..027a98f 100644
--- a/net/dcsctp/packet/chunk/init_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/init_ack_chunk.cc
@@ -9,18 +9,17 @@
*/
#include "net/dcsctp/packet/chunk/init_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/parameter/parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_format.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/init_ack_chunk_test.cc b/net/dcsctp/packet/chunk/init_ack_chunk_test.cc
index 184ade7..2741d67 100644
--- a/net/dcsctp/packet/chunk/init_ack_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/init_ack_chunk_test.cc
@@ -9,19 +9,19 @@
*/
#include "net/dcsctp/packet/chunk/init_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <utility>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h"
#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/packet/parameter/state_cookie_parameter.h"
#include "net/dcsctp/packet/parameter/supported_extensions_parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/init_chunk.cc b/net/dcsctp/packet/chunk/init_chunk.cc
index c9ca4ae..5f557c7 100644
--- a/net/dcsctp/packet/chunk/init_chunk.cc
+++ b/net/dcsctp/packet/chunk/init_chunk.cc
@@ -9,18 +9,17 @@
*/
#include "net/dcsctp/packet/chunk/init_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
#include <utility>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/parameter/parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_format.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/init_chunk_test.cc b/net/dcsctp/packet/chunk/init_chunk_test.cc
index bd36d6f..70372c7 100644
--- a/net/dcsctp/packet/chunk/init_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/init_chunk_test.cc
@@ -9,17 +9,15 @@
*/
#include "net/dcsctp/packet/chunk/init_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h"
#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/packet/parameter/supported_extensions_parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/reconfig_chunk.cc b/net/dcsctp/packet/chunk/reconfig_chunk.cc
index 6cbbd17..b9188c9 100644
--- a/net/dcsctp/packet/chunk/reconfig_chunk.cc
+++ b/net/dcsctp/packet/chunk/reconfig_chunk.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/chunk/reconfig_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <utility>
#include <vector>
@@ -19,7 +19,6 @@
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/parameter/parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/sack_chunk.cc b/net/dcsctp/packet/chunk/sack_chunk.cc
index 108c5ca..3ee23a8 100644
--- a/net/dcsctp/packet/chunk/sack_chunk.cc
+++ b/net/dcsctp/packet/chunk/sack_chunk.cc
@@ -9,18 +9,18 @@
*/
#include "net/dcsctp/packet/chunk/sack_chunk.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
+#include <set>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/str_join.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc b/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
index 31ba417..438bfa8 100644
--- a/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_ack_chunk.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/chunk/shutdown_ack_chunk_test.cc b/net/dcsctp/packet/chunk/shutdown_ack_chunk_test.cc
index ef04ea9..a2a05a1 100644
--- a/net/dcsctp/packet/chunk/shutdown_ack_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/shutdown_ack_chunk_test.cc
@@ -9,12 +9,10 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_ack_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <vector>
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/shutdown_chunk.cc b/net/dcsctp/packet/chunk/shutdown_chunk.cc
index 8038458..9554b62 100644
--- a/net/dcsctp/packet/chunk/shutdown_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_chunk.cc
@@ -9,16 +9,15 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/shutdown_chunk_test.cc b/net/dcsctp/packet/chunk/shutdown_chunk_test.cc
index 16d147c..072a1a1 100644
--- a/net/dcsctp/packet/chunk/shutdown_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/shutdown_chunk_test.cc
@@ -9,13 +9,12 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_chunk.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc b/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
index 0733f21..5fa1c37 100644
--- a/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
+++ b/net/dcsctp/packet/chunk/shutdown_complete_chunk.cc
@@ -9,16 +9,14 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_complete_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/chunk/shutdown_complete_chunk_test.cc b/net/dcsctp/packet/chunk/shutdown_complete_chunk_test.cc
index 253900d..cc1d01b 100644
--- a/net/dcsctp/packet/chunk/shutdown_complete_chunk_test.cc
+++ b/net/dcsctp/packet/chunk/shutdown_complete_chunk_test.cc
@@ -9,12 +9,10 @@
*/
#include "net/dcsctp/packet/chunk/shutdown_complete_chunk.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <vector>
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
index 61dc953..6530f40 100644
--- a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
+++ b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause_test.cc b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause_test.cc
index afb8364..475e53d 100644
--- a/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/error_cause.cc b/net/dcsctp/packet/error_cause/error_cause.cc
index 291cc51..d6a885b 100644
--- a/net/dcsctp/packet/error_cause/error_cause.cc
+++ b/net/dcsctp/packet/error_cause/error_cause.cc
@@ -9,17 +9,11 @@
*/
#include "net/dcsctp/packet/error_cause/error_cause.h"
-#include <stddef.h>
-
-#include <cstdint>
-#include <memory>
+#include <cstddef>
#include <optional>
#include <string>
-#include <utility>
#include <vector>
-#include "api/array_view.h"
-#include "net/dcsctp/common/math.h"
#include "net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h"
#include "net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h"
#include "net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h"
@@ -33,6 +27,7 @@
#include "net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h"
#include "net/dcsctp/packet/error_cause/unresolvable_address_cause.h"
#include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
index 8ddd4fb..4e8fdf9 100644
--- a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause_test.cc b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause_test.cc
index 3d532d0..b6d461c 100644
--- a/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
index 225ed71..3e661ca 100644
--- a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
+++ b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc
@@ -9,17 +9,15 @@
*/
#include "net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause_test.cc b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause_test.cc
index a282ce5..5b2fe80 100644
--- a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause_test.cc
@@ -9,13 +9,12 @@
*/
#include "net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/public/types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
index 378d83d..5a40837 100644
--- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc
@@ -9,18 +9,15 @@
*/
#include "net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/str_join.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause_test.cc b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause_test.cc
index 1c526ff..ade3667 100644
--- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/no_user_data_cause.cc b/net/dcsctp/packet/error_cause/no_user_data_cause.cc
index 45cef7e..c73163e 100644
--- a/net/dcsctp/packet/error_cause/no_user_data_cause.cc
+++ b/net/dcsctp/packet/error_cause/no_user_data_cause.cc
@@ -9,17 +9,15 @@
*/
#include "net/dcsctp/packet/error_cause/no_user_data_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/no_user_data_cause_test.cc b/net/dcsctp/packet/error_cause/no_user_data_cause_test.cc
index 0a535bf..c96d570 100644
--- a/net/dcsctp/packet/error_cause/no_user_data_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/no_user_data_cause_test.cc
@@ -9,13 +9,12 @@
*/
#include "net/dcsctp/packet/error_cause/no_user_data_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
index ffa3c16..9e2adc7 100644
--- a/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
+++ b/net/dcsctp/packet/error_cause/out_of_resource_error_cause.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/error_cause/out_of_resource_error_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/error_cause/out_of_resource_error_cause_test.cc b/net/dcsctp/packet/error_cause/out_of_resource_error_cause_test.cc
index 501fc20..38eef4a 100644
--- a/net/dcsctp/packet/error_cause/out_of_resource_error_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/out_of_resource_error_cause_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/error_cause/out_of_resource_error_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
index d7bc582..65bbfef 100644
--- a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
+++ b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc
@@ -9,17 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/protocol_violation_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/protocol_violation_cause_test.cc b/net/dcsctp/packet/error_cause/protocol_violation_cause_test.cc
index 902d867..de3ef22 100644
--- a/net/dcsctp/packet/error_cause/protocol_violation_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/protocol_violation_cause_test.cc
@@ -9,17 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/protocol_violation_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
-#include "net/dcsctp/packet/error_cause/error_cause.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
index fd3dfa8..ab15b6a 100644
--- a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
+++ b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.cc
@@ -9,16 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause_test.cc b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause_test.cc
index b8ab8b6..0c3b3fc 100644
--- a/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
index 122c28f4..8cb6f8e 100644
--- a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
+++ b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc
@@ -9,17 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/stale_cookie_error_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/stale_cookie_error_cause_test.cc b/net/dcsctp/packet/error_cause/stale_cookie_error_cause_test.cc
index c0d1ac1..aef130c 100644
--- a/net/dcsctp/packet/error_cause/stale_cookie_error_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/stale_cookie_error_cause_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/error_cause/stale_cookie_error_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
index 708111e..fac0647 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
+++ b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.cc
@@ -9,16 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause_test.cc b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause_test.cc
index 0449599..189205c 100644
--- a/net/dcsctp/packet/error_cause/unrecognized_parameter_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/unrecognized_parameter_cause_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc b/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
index b7b9ffb..8b3493e 100644
--- a/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
+++ b/net/dcsctp/packet/error_cause/unresolvable_address_cause.cc
@@ -9,16 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/unresolvable_address_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
+#include <string>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/unresolvable_address_cause_test.cc b/net/dcsctp/packet/error_cause/unresolvable_address_cause_test.cc
index 688730e..4c76683 100644
--- a/net/dcsctp/packet/error_cause/unresolvable_address_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/unresolvable_address_cause_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/unresolvable_address_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
index de86983..557a152 100644
--- a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
+++ b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc
@@ -9,17 +9,14 @@
*/
#include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/error_cause/user_initiated_abort_cause_test.cc b/net/dcsctp/packet/error_cause/user_initiated_abort_cause_test.cc
index 250959e..6839007 100644
--- a/net/dcsctp/packet/error_cause/user_initiated_abort_cause_test.cc
+++ b/net/dcsctp/packet/error_cause/user_initiated_abort_cause_test.cc
@@ -9,17 +9,13 @@
*/
#include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h"
-#include <stdint.h>
-
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
-#include "net/dcsctp/packet/error_cause/error_cause.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/packet/parameter/parameter.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
index 55b189b..bb982da 100644
--- a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc
@@ -9,18 +9,15 @@
*/
#include "net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter_test.cc b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter_test.cc
index a29257a..134201c 100644
--- a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter_test.cc
@@ -9,13 +9,12 @@
*/
#include "net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
index 3f9e9c3..9e4f679 100644
--- a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc
@@ -9,17 +9,15 @@
*/
#include "net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter_test.cc b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter_test.cc
index d0303b1..0e1f181 100644
--- a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter_test.cc
@@ -9,13 +9,12 @@
*/
#include "net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
index fed399f..6ab7b75 100644
--- a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
+++ b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.cc
@@ -9,9 +9,9 @@
*/
#include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
diff --git a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter_test.cc b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter_test.cc
index fb4f983..b5429ee 100644
--- a/net/dcsctp/packet/parameter/forward_tsn_supported_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/forward_tsn_supported_parameter_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
index 93d283d..dc78b77 100644
--- a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
+++ b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc
@@ -9,17 +9,14 @@
*/
#include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
index 138c2fd..e9e70a3 100644
--- a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc
@@ -9,8 +9,7 @@
*/
#include "net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
#include <string>
@@ -18,9 +17,10 @@
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
index 56ec00e..4338dcf 100644
--- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc
@@ -9,8 +9,7 @@
*/
#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
#include <string>
@@ -21,7 +20,6 @@
#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/net/dcsctp/packet/parameter/parameter.cc b/net/dcsctp/packet/parameter/parameter.cc
index e6765c1..fadcbd4 100644
--- a/net/dcsctp/packet/parameter/parameter.cc
+++ b/net/dcsctp/packet/parameter/parameter.cc
@@ -9,32 +9,15 @@
*/
#include "net/dcsctp/packet/parameter/parameter.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
-#include <memory>
#include <optional>
-#include <string>
-#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
#include "net/dcsctp/common/math.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
-#include "net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h"
-#include "net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h"
-#include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h"
-#include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h"
-#include "net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h"
-#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h"
-#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h"
-#include "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h"
-#include "net/dcsctp/packet/parameter/state_cookie_parameter.h"
-#include "net/dcsctp/packet/parameter/supported_extensions_parameter.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/logging.h"
-#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
index b8debe8..c8a494d 100644
--- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
+++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc
@@ -9,9 +9,8 @@
*/
#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h"
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include <string>
#include <type_traits>
@@ -19,9 +18,9 @@
#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc
index b784545..dd54fe6 100644
--- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
-#include <type_traits>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
index 93d5f13..090bd08 100644
--- a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
+++ b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc
@@ -9,17 +9,15 @@
*/
#include "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter_test.cc b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter_test.cc
index eeb973c..abbdeec 100644
--- a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter_test.cc
@@ -9,14 +9,12 @@
*/
#include "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
-#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/state_cookie_parameter.cc b/net/dcsctp/packet/parameter/state_cookie_parameter.cc
index 0c4d068..9fd6558 100644
--- a/net/dcsctp/packet/parameter/state_cookie_parameter.cc
+++ b/net/dcsctp/packet/parameter/state_cookie_parameter.cc
@@ -9,17 +9,14 @@
*/
#include "net/dcsctp/packet/parameter/state_cookie_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
#include <string>
-#include <type_traits>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
-#include "net/dcsctp/packet/tlv_trait.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/state_cookie_parameter_test.cc b/net/dcsctp/packet/parameter/state_cookie_parameter_test.cc
index bcca38b..4093764 100644
--- a/net/dcsctp/packet/parameter/state_cookie_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/state_cookie_parameter_test.cc
@@ -9,15 +9,13 @@
*/
#include "net/dcsctp/packet/parameter/state_cookie_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
index 4fd46c9..d65105f 100644
--- a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
+++ b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc
@@ -9,12 +9,15 @@
*/
#include "net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h"
-#include <stdint.h>
-
+#include <cstdint>
#include <optional>
+#include <string>
#include <vector>
#include "api/array_view.h"
+#include "net/dcsctp/packet/bounded_byte_reader.h"
+#include "net/dcsctp/packet/bounded_byte_writer.h"
+#include "net/dcsctp/public/types.h"
#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
diff --git a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter_test.cc b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter_test.cc
index 861fa4d..f5c7d3f 100644
--- a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter_test.cc
+++ b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter_test.cc
@@ -9,13 +9,11 @@
*/
#include "net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h"
-#include <stdint.h>
-
-#include <type_traits>
+#include <cstdint>
#include <vector>
+#include "net/dcsctp/public/types.h"
#include "net/dcsctp/testing/testing_macros.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/net/dcsctp/packet/sctp_packet.cc b/net/dcsctp/packet/sctp_packet.cc
index 391d521..0440f36 100644
--- a/net/dcsctp/packet/sctp_packet.cc
+++ b/net/dcsctp/packet/sctp_packet.cc
@@ -9,22 +9,22 @@
*/
#include "net/dcsctp/packet/sctp_packet.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <optional>
-#include <string>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/common/math.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/chunk.h"
#include "net/dcsctp/packet/crc32c.h"
#include "net/dcsctp/public/dcsctp_options.h"
+#include "net/dcsctp/public/types.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_format.h"
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index 2046a27..33d5228 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -47,9 +47,11 @@
"../../../api:array_view",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
+ "../common:internal_types",
"../common:sequence_numbers",
"../packet:chunk",
"../packet:data",
+ "../public:socket",
"../public:types",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/strings:string_view",
@@ -65,9 +67,11 @@
"../../../api:array_view",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
+ "../common:internal_types",
"../common:sequence_numbers",
"../packet:chunk",
"../packet:data",
+ "../public:socket",
"../public:types",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/strings:string_view",
@@ -120,9 +124,11 @@
"../../../rtc_base:gunit_helpers",
"../../../test:test_support",
"../common:handover_testing",
+ "../common:internal_types",
"../common:sequence_numbers",
"../packet:chunk",
"../packet:data",
+ "../public:socket",
"../public:types",
"../testing:data_generator",
"../timer",
diff --git a/net/dcsctp/rx/interleaved_reassembly_streams.cc b/net/dcsctp/rx/interleaved_reassembly_streams.cc
index c34c042..0e4dbe2 100644
--- a/net/dcsctp/rx/interleaved_reassembly_streams.cc
+++ b/net/dcsctp/rx/interleaved_reassembly_streams.cc
@@ -9,23 +9,25 @@
*/
#include "net/dcsctp/rx/interleaved_reassembly_streams.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
-#include <functional>
#include <iterator>
#include <map>
-#include <numeric>
-#include <unordered_map>
+#include <tuple>
#include <utility>
#include <vector>
#include "absl/algorithm/container.h"
+#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/common/sequence_numbers.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
#include "net/dcsctp/packet/data.h"
+#include "net/dcsctp/public/dcsctp_handover_state.h"
+#include "net/dcsctp/public/dcsctp_message.h"
#include "net/dcsctp/public/types.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
namespace dcsctp {
diff --git a/net/dcsctp/rx/reassembly_queue.cc b/net/dcsctp/rx/reassembly_queue.cc
index 3d3c5a4..5607221 100644
--- a/net/dcsctp/rx/reassembly_queue.cc
+++ b/net/dcsctp/rx/reassembly_queue.cc
@@ -9,32 +9,29 @@
*/
#include "net/dcsctp/rx/reassembly_queue.h"
-#include <stddef.h>
-
-#include <algorithm>
-#include <cstdint>
+#include <cstddef>
#include <memory>
#include <optional>
-#include <set>
-#include <string>
#include <utility>
#include <vector>
#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/common/sequence_numbers.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
#include "net/dcsctp/packet/data.h"
-#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h"
-#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h"
#include "net/dcsctp/public/dcsctp_handover_state.h"
#include "net/dcsctp/public/dcsctp_message.h"
#include "net/dcsctp/public/types.h"
#include "net/dcsctp/rx/interleaved_reassembly_streams.h"
#include "net/dcsctp/rx/reassembly_streams.h"
#include "net/dcsctp/rx/traditional_reassembly_streams.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/containers/flat_set.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/str_join.h"
+#include "rtc_base/strings/string_builder.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/rx/reassembly_queue_test.cc b/net/dcsctp/rx/reassembly_queue_test.cc
index e619f40..55fe312 100644
--- a/net/dcsctp/rx/reassembly_queue_test.cc
+++ b/net/dcsctp/rx/reassembly_queue_test.cc
@@ -9,25 +9,24 @@
*/
#include "net/dcsctp/rx/reassembly_queue.h"
-#include <stddef.h>
-
#include <algorithm>
#include <array>
+#include <cstddef>
#include <cstdint>
#include <iterator>
#include <vector>
#include "api/array_view.h"
#include "net/dcsctp/common/handover_testing.h"
-#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
-#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h"
#include "net/dcsctp/packet/data.h"
+#include "net/dcsctp/public/dcsctp_handover_state.h"
#include "net/dcsctp/public/dcsctp_message.h"
#include "net/dcsctp/public/types.h"
#include "net/dcsctp/testing/data_generator.h"
-#include "rtc_base/gunit.h"
#include "test/gmock.h"
+#include "test/gtest.h"
namespace dcsctp {
namespace {
diff --git a/net/dcsctp/rx/traditional_reassembly_streams.cc b/net/dcsctp/rx/traditional_reassembly_streams.cc
index aca565d..cae1d7d 100644
--- a/net/dcsctp/rx/traditional_reassembly_streams.cc
+++ b/net/dcsctp/rx/traditional_reassembly_streams.cc
@@ -9,23 +9,27 @@
*/
#include "net/dcsctp/rx/traditional_reassembly_streams.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
-#include <functional>
#include <iterator>
#include <map>
#include <numeric>
#include <optional>
+#include <tuple>
#include <utility>
#include <vector>
#include "absl/algorithm/container.h"
+#include "absl/strings/string_view.h"
#include "api/array_view.h"
+#include "net/dcsctp/common/internal_types.h"
#include "net/dcsctp/common/sequence_numbers.h"
#include "net/dcsctp/packet/chunk/forward_tsn_common.h"
#include "net/dcsctp/packet/data.h"
+#include "net/dcsctp/public/dcsctp_handover_state.h"
#include "net/dcsctp/public/dcsctp_message.h"
+#include "net/dcsctp/public/types.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
namespace dcsctp {
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index f6fbe7f..5c26ea0 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -25,6 +25,7 @@
":context",
"../../../api:array_view",
"../../../api/units:time_delta",
+ "../../../api/units:timestamp",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
"../packet:bounded_io",
diff --git a/net/dcsctp/socket/heartbeat_handler.cc b/net/dcsctp/socket/heartbeat_handler.cc
index 5131ee0..1b52900 100644
--- a/net/dcsctp/socket/heartbeat_handler.cc
+++ b/net/dcsctp/socket/heartbeat_handler.cc
@@ -9,12 +9,10 @@
*/
#include "net/dcsctp/socket/heartbeat_handler.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <cstdint>
#include <memory>
#include <optional>
-#include <string>
#include <utility>
#include <vector>
@@ -22,6 +20,7 @@
#include "absl/strings/string_view.h"
#include "api/array_view.h"
#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "net/dcsctp/packet/bounded_byte_reader.h"
#include "net/dcsctp/packet/bounded_byte_writer.h"
#include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h"
@@ -33,6 +32,7 @@
#include "net/dcsctp/public/dcsctp_socket.h"
#include "net/dcsctp/socket/context.h"
#include "net/dcsctp/timer/timer.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
namespace dcsctp {
