diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 4e093bc3a7..2853e65429 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -307,8 +307,6 @@ rtc_library("video_codec_interface") {
 rtc_library("video_coding_legacy") {
   visibility = [ ":video_coding_unittests" ]
   sources = [
-    "decoding_state.cc",
-    "decoding_state.h",
     "event_wrapper.cc",
     "event_wrapper.h",
     "include/video_coding.h",
@@ -352,6 +350,7 @@ rtc_library("video_coding_legacy") {
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
     "../rtp_rtcp:rtp_video_header",
+    "deprecated:deprecated_decoding_state",
     "deprecated:deprecated_frame_buffer",
     "deprecated:deprecated_jitter_buffer_common",
     "deprecated:deprecated_packet",
@@ -1139,7 +1138,6 @@ if (rtc_include_tests) {
       "codecs/vp8/screenshare_layers_unittest.cc",
       "codecs/vp9/svc_config_unittest.cc",
       "decoder_database_unittest.cc",
-      "decoding_state_unittest.cc",
       "fec_controller_unittest.cc",
       "frame_dependencies_calculator_unittest.cc",
       "frame_helpers_unittest.cc",
diff --git a/modules/video_coding/deprecated/BUILD.gn b/modules/video_coding/deprecated/BUILD.gn
index 9898ff21ae..c9f226d9fc 100644
--- a/modules/video_coding/deprecated/BUILD.gn
+++ b/modules/video_coding/deprecated/BUILD.gn
@@ -14,6 +14,21 @@ visibility = [
   "../:video_coding_unittests",
 ]
 
+rtc_library("deprecated_decoding_state") {
+  sources = [
+    "decoding_state.cc",
+    "decoding_state.h",
+  ]
+  deps = [
+    ":deprecated_frame_buffer",
+    ":deprecated_jitter_buffer_common",
+    ":deprecated_packet",
+    "../../../common_video",
+    "../../../modules:module_api_public",
+    "../../../rtc_base:logging",
+  ]
+}
+
 rtc_library("deprecated_jitter_buffer_common") {
   sources = [ "jitter_buffer_common.h" ]
 }
@@ -71,11 +86,18 @@ rtc_library("deprecated_session_info") {
 
 rtc_library("deprecated_unittests") {
   testonly = true
-  sources = [ "session_info_unittest.cc" ]
+  sources = [
+    "decoding_state_unittest.cc",
+    "session_info_unittest.cc",
+  ]
   visibility += [ "../../../modules/*" ]
   deps = [
+    ":deprecated_decoding_state",
+    ":deprecated_frame_buffer",
     ":deprecated_packet",
     ":deprecated_session_info",
+    "../../../modules/rtp_rtcp:rtp_video_header",
+    "../../../modules/video_coding:codec_globals_headers",
     "../../../test:test_support",
   ]
 }
diff --git a/modules/video_coding/decoding_state.cc b/modules/video_coding/deprecated/decoding_state.cc
similarity index 99%
rename from modules/video_coding/decoding_state.cc
rename to modules/video_coding/deprecated/decoding_state.cc
index cf465c252f..1ec8e107a9 100644
--- a/modules/video_coding/decoding_state.cc
+++ b/modules/video_coding/deprecated/decoding_state.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/decoding_state.h"
+#include "modules/video_coding/deprecated/decoding_state.h"
 
 #include "common_video/h264/h264_common.h"
 #include "modules/include/module_common_types_public.h"
diff --git a/modules/video_coding/decoding_state.h b/modules/video_coding/deprecated/decoding_state.h
similarity index 94%
rename from modules/video_coding/decoding_state.h
rename to modules/video_coding/deprecated/decoding_state.h
index ec972949d8..19f6daabc5 100644
--- a/modules/video_coding/decoding_state.h
+++ b/modules/video_coding/deprecated/decoding_state.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_
-#define MODULES_VIDEO_CODING_DECODING_STATE_H_
+#ifndef MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_
+#define MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_
 
 #include <cstdint>
 #include <map>
@@ -86,4 +86,4 @@ class VCMDecodingState {
 
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_CODING_DECODING_STATE_H_
+#endif  // MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_
diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/deprecated/decoding_state_unittest.cc
similarity index 99%
rename from modules/video_coding/decoding_state_unittest.cc
rename to modules/video_coding/deprecated/decoding_state_unittest.cc
index 454ec997f0..1b589b05ab 100644
--- a/modules/video_coding/decoding_state_unittest.cc
+++ b/modules/video_coding/deprecated/decoding_state_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/decoding_state.h"
+#include "modules/video_coding/deprecated/decoding_state.h"
 
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
@@ -17,7 +17,6 @@
 #include "modules/video_coding/deprecated/frame_buffer.h"
 #include "modules/video_coding/deprecated/packet.h"
 #include "modules/video_coding/deprecated/session_info.h"
-#include "modules/video_coding/include/video_coding.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h
index def85c9b18..d6ecd76d47 100644
--- a/modules/video_coding/jitter_buffer.h
+++ b/modules/video_coding/jitter_buffer.h
@@ -20,7 +20,7 @@
 #include "api/field_trials_view.h"
 #include "modules/include/module_common_types.h"
 #include "modules/include/module_common_types_public.h"
-#include "modules/video_coding/decoding_state.h"
+#include "modules/video_coding/deprecated/decoding_state.h"
 #include "modules/video_coding/deprecated/jitter_buffer_common.h"
 #include "modules/video_coding/event_wrapper.h"
 #include "modules/video_coding/include/video_coding.h"