diff --git a/modules/congestion_controller/bbr/BUILD.gn b/modules/congestion_controller/bbr/BUILD.gn
index 22ee7b7e87..0299505106 100644
--- a/modules/congestion_controller/bbr/BUILD.gn
+++ b/modules/congestion_controller/bbr/BUILD.gn
@@ -36,7 +36,6 @@ rtc_source_set("bbr_controller") {
     "../../../rtc_base/experiments:congestion_controller_experiment",
     "../../../rtc_base/system:fallthrough",
     "../network_control",
-    "../network_control/units",
   ]
 }
 rtc_source_set("data_transfer_tracker") {
@@ -48,7 +47,9 @@ rtc_source_set("data_transfer_tracker") {
   deps = [
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
-    "../network_control/units",
+    "../network_control/units:data_size",
+    "../network_control/units:time_delta",
+    "../network_control/units:timestamp",
   ]
 }
 rtc_source_set("rtt_stats") {
@@ -59,7 +60,8 @@ rtc_source_set("rtt_stats") {
   ]
   deps = [
     "../../../rtc_base:rtc_base_approved",
-    "../network_control/units",
+    "../network_control/units:time_delta",
+    "../network_control/units:timestamp",
   ]
 }
 rtc_source_set("windowed_filter") {
@@ -85,7 +87,8 @@ if (rtc_include_tests) {
       ":windowed_filter",
       "../../../test:test_support",
       "../network_control:network_control_test",
-      "../network_control/units",
+      "../network_control/units:data_rate",
+      "../network_control/units:time_delta",
     ]
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
diff --git a/modules/congestion_controller/bbr/bbr_network_controller.cc b/modules/congestion_controller/bbr/bbr_network_controller.cc
index dd9affd5e6..a373a12a20 100644
--- a/modules/congestion_controller/bbr/bbr_network_controller.cc
+++ b/modules/congestion_controller/bbr/bbr_network_controller.cc
@@ -15,7 +15,6 @@
 #include <string>
 #include <vector>
 
-#include "modules/congestion_controller/network_control/units/network_units.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/congestion_controller_experiment.h"
 #include "rtc_base/logging.h"
diff --git a/modules/congestion_controller/bbr/data_transfer_tracker.h b/modules/congestion_controller/bbr/data_transfer_tracker.h
index 74d0f81777..1c2d117224 100644
--- a/modules/congestion_controller/bbr/data_transfer_tracker.h
+++ b/modules/congestion_controller/bbr/data_transfer_tracker.h
@@ -11,7 +11,9 @@
 #define MODULES_CONGESTION_CONTROLLER_BBR_DATA_TRANSFER_TRACKER_H_
 
 #include <deque>
-#include "modules/congestion_controller/network_control/units/network_units.h"
+#include "modules/congestion_controller/network_control/units/data_size.h"
+#include "modules/congestion_controller/network_control/units/time_delta.h"
+#include "modules/congestion_controller/network_control/units/timestamp.h"
 
 namespace webrtc {
 namespace bbr {
diff --git a/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc b/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc
index 51afae4499..7615a9fbb1 100644
--- a/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc
+++ b/modules/congestion_controller/bbr/data_transfer_tracker_unittest.cc
@@ -9,7 +9,6 @@
  */
 
 #include "modules/congestion_controller/bbr/data_transfer_tracker.h"
-#include "modules/congestion_controller/network_control/units/network_units.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/bbr/rtt_stats.cc b/modules/congestion_controller/bbr/rtt_stats.cc
index 9c65702477..e79ba9f402 100644
--- a/modules/congestion_controller/bbr/rtt_stats.cc
+++ b/modules/congestion_controller/bbr/rtt_stats.cc
@@ -12,7 +12,6 @@
 
 #include <cstdlib>
 
-#include "modules/congestion_controller/network_control/units/network_units.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/bbr/rtt_stats.h b/modules/congestion_controller/bbr/rtt_stats.h
index 13c52cee76..7f20949ed6 100644
--- a/modules/congestion_controller/bbr/rtt_stats.h
+++ b/modules/congestion_controller/bbr/rtt_stats.h
@@ -16,7 +16,8 @@
 #include <algorithm>
 #include <cstdint>
 
-#include "modules/congestion_controller/network_control/units/network_units.h"
+#include "modules/congestion_controller/network_control/units/time_delta.h"
+#include "modules/congestion_controller/network_control/units/timestamp.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/logging.h"
 
diff --git a/modules/congestion_controller/bbr/windowed_filter_unittest.cc b/modules/congestion_controller/bbr/windowed_filter_unittest.cc
index a7092a2297..e8cd64291b 100644
--- a/modules/congestion_controller/bbr/windowed_filter_unittest.cc
+++ b/modules/congestion_controller/bbr/windowed_filter_unittest.cc
@@ -10,6 +10,9 @@
 
 #include "modules/congestion_controller/bbr/windowed_filter.h"
 
+#include "modules/congestion_controller/network_control/units/data_rate.h"
+#include "modules/congestion_controller/network_control/units/time_delta.h"
+
 #include "modules/congestion_controller/bbr/rtt_stats.h"
 #include "test/gtest.h"
 
diff --git a/modules/congestion_controller/network_control/BUILD.gn b/modules/congestion_controller/network_control/BUILD.gn
index 047e06eb2d..a9c4d34cbb 100644
--- a/modules/congestion_controller/network_control/BUILD.gn
+++ b/modules/congestion_controller/network_control/BUILD.gn
@@ -20,7 +20,10 @@ rtc_static_library("network_control") {
     "../../../api:optional",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
-    "units",
+    "units:data_rate",
+    "units:data_size",
+    "units:time_delta",
+    "units:timestamp",
   ]
 }
 
@@ -38,7 +41,6 @@ if (rtc_include_tests) {
       "../../../rtc_base:checks",
       "../../../rtc_base:rtc_base_approved",
       "../../../test:test_support",
-      "units",
     ]
   }
   rtc_source_set("network_control_unittests") {
diff --git a/modules/congestion_controller/network_control/include/network_control.h b/modules/congestion_controller/network_control/include/network_control.h
index afcc6d2105..d6ce10a7e6 100644
--- a/modules/congestion_controller/network_control/include/network_control.h
+++ b/modules/congestion_controller/network_control/include/network_control.h
@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "modules/congestion_controller/network_control/include/network_types.h"
-#include "modules/congestion_controller/network_control/units/network_units.h"
 
 namespace webrtc {
 
diff --git a/modules/congestion_controller/network_control/include/network_types.h b/modules/congestion_controller/network_control/include/network_types.h
index 321632469e..84698982b2 100644
--- a/modules/congestion_controller/network_control/include/network_types.h
+++ b/modules/congestion_controller/network_control/include/network_types.h
@@ -12,8 +12,13 @@
 #define MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_INCLUDE_NETWORK_TYPES_H_
 #include <stdint.h>
 #include <vector>
-#include "modules/congestion_controller/network_control/units/network_units.h"
+#include "modules/congestion_controller/network_control/units/data_rate.h"
+#include "modules/congestion_controller/network_control/units/data_size.h"
+#include "modules/congestion_controller/network_control/units/time_delta.h"
+#include "modules/congestion_controller/network_control/units/timestamp.h"
+
 #include "modules/include/module_common_types.h"
+
 #include "rtc_base/constructormagic.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/network_control/units/BUILD.gn b/modules/congestion_controller/network_control/units/BUILD.gn
index 4dc884e9cc..5cb5471d55 100644
--- a/modules/congestion_controller/network_control/units/BUILD.gn
+++ b/modules/congestion_controller/network_control/units/BUILD.gn
@@ -8,22 +8,6 @@
 
 import("../../../../webrtc.gni")
 
-rtc_source_set("units") {
-  sources = [
-    "network_units.h",
-  ]
-
-  deps = [
-    ":data_rate",
-    ":data_size",
-    ":time_delta",
-    ":timestamp",
-    "../../../../api:optional",
-    "../../../../rtc_base:checks",
-    "../../../../rtc_base:rtc_base_approved",
-  ]
-}
-
 rtc_source_set("data_rate") {
   sources = [
     "data_rate.cc",
@@ -92,7 +76,6 @@ if (rtc_include_tests) {
       ":data_size",
       ":time_delta",
       ":timestamp",
-      ":units",
       "../../../../test:test_support",
     ]
   }
diff --git a/modules/congestion_controller/network_control/units/network_units.h b/modules/congestion_controller/network_control/units/network_units.h
deleted file mode 100644
index cd88c50056..0000000000
--- a/modules/congestion_controller/network_control/units/network_units.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_
-#define MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_
-
-#include "modules/congestion_controller/network_control/units/data_rate.h"
-#include "modules/congestion_controller/network_control/units/data_size.h"
-#include "modules/congestion_controller/network_control/units/time_delta.h"
-#include "modules/congestion_controller/network_control/units/timestamp.h"
-
-#endif  // MODULES_CONGESTION_CONTROLLER_NETWORK_CONTROL_UNITS_NETWORK_UNITS_H_