diff --git a/.gn b/.gn
index c82d4808b7..ca3a6a7517 100644
--- a/.gn
+++ b/.gn
@@ -31,6 +31,7 @@ check_targets = [
   "//webrtc/modules/audio_processing/*",
   "//webrtc/modules/bitrate_controller/*",
   "//webrtc/modules/congestion_controller/*",
+  "//webrtc/modules/desktop_capture/*",
   "//webrtc/modules/media_file/*",
   "//webrtc/modules/pacing/*",
   "//webrtc/modules/rtp_rtcp/*",
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index 5d27994a2f..4920611bec 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -22,9 +22,12 @@ rtc_static_library("primitives") {
     "desktop_region.h",
     "shared_desktop_frame.cc",
     "shared_desktop_frame.h",
+    "shared_memory.cc",
+    "shared_memory.h",
   ]
 
   deps = [
+    "../..:webrtc_common",
     "../../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
   ]
 }
@@ -41,6 +44,11 @@ if (rtc_include_tests) {
       "rgba_color.cc",
       "rgba_color.h",
     ]
+
+    deps = [
+      ":primitives",
+      "../..:webrtc_common",
+    ]
   }
 
   source_set("screen_drawer") {
@@ -57,6 +65,12 @@ if (rtc_include_tests) {
       "screen_drawer_mac.cc",
       "screen_drawer_win.cc",
     ]
+
+    deps = [
+      ":primitives",
+      "../../base:rtc_base_approved",
+      "../../system_wrappers",
+    ]
   }
 
   source_set("desktop_capture_mock") {
@@ -75,7 +89,12 @@ if (rtc_include_tests) {
       "fake_desktop_capturer.h",
       "mock_desktop_capturer_callback.cc",
       "mock_desktop_capturer_callback.h",
-      "screen_capturer_mock_objects.h",
+    ]
+
+    deps = [
+      ":primitives",
+      "../../base:rtc_base_approved",
+      "../../test:test_support",
     ]
   }
 }
@@ -121,8 +140,6 @@ rtc_static_library("desktop_capture") {
     "screen_capturer_helper.h",
     "screen_capturer_mac.mm",
     "screen_capturer_win.cc",
-    "shared_memory.cc",
-    "shared_memory.h",
     "win/cursor.cc",
     "win/cursor.h",
     "win/d3d_device.cc",
@@ -198,6 +215,7 @@ rtc_static_library("desktop_capture") {
 
   deps = [
     ":primitives",
+    "../..:webrtc_common",
     "../../base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../system_wrappers",
     "//third_party/libyuv",
diff --git a/webrtc/modules/desktop_capture/desktop_capture_types.h b/webrtc/modules/desktop_capture/desktop_capture_types.h
index 3e41796553..9a6162a766 100644
--- a/webrtc/modules/desktop_capture/desktop_capture_types.h
+++ b/webrtc/modules/desktop_capture/desktop_capture_types.h
@@ -13,7 +13,6 @@
 
 #include <stdint.h>
 
-#include "webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -40,4 +39,3 @@ const ScreenId kInvalidScreenId = -2;
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
-
diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/webrtc/modules/desktop_capture/shared_desktop_frame.cc
index 3114235273..fd67c74229 100644
--- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc
+++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc
@@ -13,7 +13,6 @@
 #include <memory>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/system_wrappers/include/atomic32.h"
 
 namespace webrtc {