diff --git a/api/units/BUILD.gn b/api/units/BUILD.gn
index 45cdcd3097..9d4f76179b 100644
--- a/api/units/BUILD.gn
+++ b/api/units/BUILD.gn
@@ -104,6 +104,7 @@ if (rtc_include_tests) {
       ":frequency",
       ":time_delta",
       ":timestamp",
+      "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../test:test_support",
     ]
diff --git a/api/units/data_rate.cc b/api/units/data_rate.cc
index f9586c5f40..c1ad9b399c 100644
--- a/api/units/data_rate.cc
+++ b/api/units/data_rate.cc
@@ -10,6 +10,8 @@
 
 #include "api/units/data_rate.h"
 
+#include <string>
+
 #include "api/array_view.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/units/data_rate.h b/api/units/data_rate.h
index 63bf39a3c3..9a7d5805b1 100644
--- a/api/units/data_rate.h
+++ b/api/units/data_rate.h
@@ -11,6 +11,7 @@
 #ifndef API_UNITS_DATA_RATE_H_
 #define API_UNITS_DATA_RATE_H_
 
+#include <cstdint>
 #include <limits>
 #include <string>
 #include <type_traits>
diff --git a/api/units/data_rate_unittest.cc b/api/units/data_rate_unittest.cc
index f77b3702d4..1fd13da9aa 100644
--- a/api/units/data_rate_unittest.cc
+++ b/api/units/data_rate_unittest.cc
@@ -10,6 +10,13 @@
 
 #include "api/units/data_rate.h"
 
+#include <cstdint>
+#include <limits>
+
+#include "api/units/data_size.h"
+#include "api/units/frequency.h"
+#include "api/units/time_delta.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "test/gtest.h"
 
diff --git a/api/units/data_size.cc b/api/units/data_size.cc
index 45487dfd83..3d2cc6efc4 100644
--- a/api/units/data_size.cc
+++ b/api/units/data_size.cc
@@ -10,6 +10,8 @@
 
 #include "api/units/data_size.h"
 
+#include <string>
+
 #include "api/array_view.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/units/data_size.h b/api/units/data_size.h
index 937513f326..8d55a127c2 100644
--- a/api/units/data_size.h
+++ b/api/units/data_size.h
@@ -11,6 +11,7 @@
 #ifndef API_UNITS_DATA_SIZE_H_
 #define API_UNITS_DATA_SIZE_H_
 
+#include <cstdint>
 #include <string>
 #include <type_traits>
 
diff --git a/api/units/data_size_unittest.cc b/api/units/data_size_unittest.cc
index eb8d98c1f0..72dfbce5e2 100644
--- a/api/units/data_size_unittest.cc
+++ b/api/units/data_size_unittest.cc
@@ -10,6 +10,7 @@
 
 #include "api/units/data_size.h"
 
+#include <cstdint>
 #include <limits>
 
 #include "test/gtest.h"
diff --git a/api/units/frequency.cc b/api/units/frequency.cc
index 2d938a2814..3bf31185c2 100644
--- a/api/units/frequency.cc
+++ b/api/units/frequency.cc
@@ -9,6 +9,9 @@
  */
 #include "api/units/frequency.h"
 
+#include <cstdint>
+#include <string>
+
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/api/units/frequency.h b/api/units/frequency.h
index e0ce2aa2d9..0faa388165 100644
--- a/api/units/frequency.h
+++ b/api/units/frequency.h
@@ -10,12 +10,14 @@
 #ifndef API_UNITS_FREQUENCY_H_
 #define API_UNITS_FREQUENCY_H_
 
+#include <cstdint>
 #include <cstdlib>
 #include <limits>
 #include <string>
 #include <type_traits>
 
 #include "api/units/time_delta.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/units/unit_base.h"  // IWYU pragma: export
 
 namespace webrtc {
diff --git a/api/units/frequency_unittest.cc b/api/units/frequency_unittest.cc
index 1260c2107d..d29849a232 100644
--- a/api/units/frequency_unittest.cc
+++ b/api/units/frequency_unittest.cc
@@ -9,8 +9,9 @@
  */
 #include "api/units/frequency.h"
 
-#include <limits>
+#include <cstdint>
 
+#include "api/units/time_delta.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/units/time_delta.cc b/api/units/time_delta.cc
index 31bf3e0106..0788a9cde6 100644
--- a/api/units/time_delta.cc
+++ b/api/units/time_delta.cc
@@ -10,6 +10,8 @@
 
 #include "api/units/time_delta.h"
 
+#include <string>
+
 #include "api/array_view.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/units/time_delta.h b/api/units/time_delta.h
index bc4c285411..33b06c546c 100644
--- a/api/units/time_delta.h
+++ b/api/units/time_delta.h
@@ -11,6 +11,7 @@
 #ifndef API_UNITS_TIME_DELTA_H_
 #define API_UNITS_TIME_DELTA_H_
 
+#include <cstdint>
 #include <cstdlib>
 #include <string>
 #include <type_traits>
diff --git a/api/units/time_delta_unittest.cc b/api/units/time_delta_unittest.cc
index 51a7aa233a..fe8ad65840 100644
--- a/api/units/time_delta_unittest.cc
+++ b/api/units/time_delta_unittest.cc
@@ -10,6 +10,8 @@
 
 #include "api/units/time_delta.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <limits>
 
 #include "test/gtest.h"
diff --git a/api/units/timestamp.cc b/api/units/timestamp.cc
index fc4f419596..9c42a50f4c 100644
--- a/api/units/timestamp.cc
+++ b/api/units/timestamp.cc
@@ -10,6 +10,8 @@
 
 #include "api/units/timestamp.h"
 
+#include <string>
+
 #include "api/array_view.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/units/timestamp.h b/api/units/timestamp.h
index 91acc6c254..abc731e72e 100644
--- a/api/units/timestamp.h
+++ b/api/units/timestamp.h
@@ -11,6 +11,7 @@
 #ifndef API_UNITS_TIMESTAMP_H_
 #define API_UNITS_TIMESTAMP_H_
 
+#include <cstdint>
 #include <string>
 #include <type_traits>
 
diff --git a/api/units/timestamp_unittest.cc b/api/units/timestamp_unittest.cc
index f49b8ddde6..1b88cb7f42 100644
--- a/api/units/timestamp_unittest.cc
+++ b/api/units/timestamp_unittest.cc
@@ -10,8 +10,10 @@
 
 #include "api/units/timestamp.h"
 
+#include <cstdint>
 #include <limits>
 
+#include "api/units/time_delta.h"
 #include "test/gtest.h"
 
 namespace webrtc {