diff --git a/media/BUILD.gn b/media/BUILD.gn
index d738e2c4d36137..c8ebd28c3b3a36 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -70,6 +70,12 @@ config("media_dependent_config") {
   }
 }
 
+source_set("cdm_api") {
+  sources = [
+    "cdm/api/content_decryption_module.h",
+  ]
+}
+
 component("media") {
   sources = [
     "cdm/aes_decryptor.cc",
@@ -80,6 +86,7 @@ component("media") {
     "cdm/cdm_allocator.h",
     "cdm/cdm_helpers.cc",
     "cdm/cdm_helpers.h",
+    "cdm/cdm_wrapper.h",
     "cdm/default_cdm_factory.cc",
     "cdm/default_cdm_factory.h",
     "cdm/json_web_key.cc",
@@ -227,7 +234,9 @@ component("media") {
   cflags = []
   libs = []
   defines = []
-  deps = []
+  deps = [
+    ":cdm_api",
+  ]
 
   include_dirs = [ "." ]
   if (media_use_ffmpeg) {
diff --git a/media/cdm/cdm_helpers.cc b/media/cdm/cdm_helpers.cc
index f413dfaa8d7761..491bff9e2f054b 100644
--- a/media/cdm/cdm_helpers.cc
+++ b/media/cdm/cdm_helpers.cc
@@ -6,7 +6,7 @@
 
 #if defined(USE_PPAPI_CDM_ADAPTER)
 // When building the ppapi adapter do not include any non-trivial base/ headers.
-#include "ppapi/cpp/logging.h"
+#include "ppapi/cpp/logging.h"  // nogncheck
 #define PLATFORM_DCHECK PP_DCHECK
 #else
 #include "base/logging.h"
diff --git a/media/cdm/cdm_wrapper.h b/media/cdm/cdm_wrapper.h
index f0ed673aa72d30..20cdaad61344ec 100644
--- a/media/cdm/cdm_wrapper.h
+++ b/media/cdm/cdm_wrapper.h
@@ -15,7 +15,7 @@
 
 #if defined(USE_PPAPI_CDM_ADAPTER)
 // When building the ppapi adapter do not include any non-trivial base/ headers.
-#include "ppapi/cpp/logging.h"
+#include "ppapi/cpp/logging.h"  // nogncheck
 #define PLATFORM_DCHECK PP_DCHECK
 #else
 #include "base/logging.h"
diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn
index b0622e125f60c6..20deaab7a71dd6 100644
--- a/media/cdm/ppapi/BUILD.gn
+++ b/media/cdm/ppapi/BUILD.gn
@@ -65,6 +65,5 @@ ppapi_cdm_adapter("clearkeycdmadapter") {
     ":clearkeycdm",
     ":clearkeycdmadapter_resources",
     "//base",  # Required for the allocator implementation.
-    "//ppapi/cpp",
   ]
 }
diff --git a/media/cdm/ppapi/ppapi_cdm_adapter.gni b/media/cdm/ppapi/ppapi_cdm_adapter.gni
index 120941314ee980..bf674100683e1c 100644
--- a/media/cdm/ppapi/ppapi_cdm_adapter.gni
+++ b/media/cdm/ppapi/ppapi_cdm_adapter.gni
@@ -18,8 +18,11 @@ template("ppapi_cdm_adapter") {
     forward_variables_from(invoker, "*")
 
     defines += [ "USE_PPAPI_CDM_ADAPTER" ]
+    deps += [
+      "//media:cdm_api",
+      "//ppapi/cpp",
+    ]
     sources += [
-      "//media/cdm/api/content_decryption_module.h",
       "//media/cdm/cdm_helpers.cc",
       "//media/cdm/cdm_helpers.h",
       "//media/cdm/cdm_wrapper.h",
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
index af0dd6c2723fa9..e2093a58849f6d 100644
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -128,7 +128,6 @@ if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) {
       ":version_h",
       ":widevinecdm",
       ":widevinecdmadapter_resources",
-      "//ppapi/cpp",
     ]
 
     if (is_linux) {