diff --git a/include/OWNERS b/include/OWNERS
index 0222513df2..535040c539 100644
--- a/include/OWNERS
+++ b/include/OWNERS
@@ -7,9 +7,12 @@ yangguo@chromium.org
 
 per-file *DEPS=file:../COMMON_OWNERS
 per-file v8-internal.h=file:../COMMON_OWNERS
-per-file v8-inspector.h=file:../src/inspector/OWNERS
-per-file v8-inspector-protocol.h=file:../src/inspector/OWNERS
+
+per-file v8-debug.h=file:../src/debug/OWNERS
+
 per-file js_protocol.pdl=file:../src/inspector/OWNERS
+per-file v8-inspector*=file:../src/inspector/OWNERS
+per-file v8-inspector*=file:../src/inspector/OWNERS
 
 # Needed by the auto_tag builder
 per-file v8-version.h=v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com
diff --git a/src/api/OWNERS b/src/api/OWNERS
index 519588070b..eb4a924271 100644
--- a/src/api/OWNERS
+++ b/src/api/OWNERS
@@ -6,3 +6,6 @@ leszeks@chromium.org
 mlippautz@chromium.org
 mslekova@chromium.org
 verwaest@chromium.org
+
+# For v8-debug.h implementations.
+per-file api.cc=file:../debug/OWNERS