diff --git a/src/BUILD.gn b/src/BUILD.gn
index b39261d..f0f2b35 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -18,7 +18,7 @@
   ]
 
   if (is_debug) {
-    deps += [ ":common_debug" ]
+    deps += [ ":dlog" ]
   }
 }
 
@@ -30,7 +30,7 @@
 }
 
 # Debug code that is not specific to a certain image so can be shared.
-source_set("common_debug") {
+source_set("dlog") {
   sources = [
     "dlog.c",
   ]
@@ -48,8 +48,11 @@
 
   deps = [
     ":common",
-    ":common_debug",
   ]
+
+  if (is_debug) {
+    deps += [ ":dlog" ]
+  }
 }
 
 source_set("fdt_handler") {
@@ -59,9 +62,12 @@
 
   deps = [
     ":common",
-    ":common_debug",
     ":fdt",
   ]
+
+  if (is_debug) {
+    deps += [ ":dlog" ]
+  }
 }
 
 source_set("memiter") {
@@ -76,9 +82,11 @@
     "mm.c",
   ]
 
-  deps = [
-    ":common_debug",
-  ]
+  deps = []
+
+  if (is_debug) {
+    deps += [ ":dlog" ]
+  }
 }
 
 executable("unit_tests") {
diff --git a/test/vm/BUILD.gn b/test/vm/BUILD.gn
index 2103fbd..21c9ad0 100644
--- a/test/vm/BUILD.gn
+++ b/test/vm/BUILD.gn
@@ -8,7 +8,7 @@
 
   deps = [
     "//src:common",
-    "//src:common_debug",
+    "//src:dlog",
     "//src:fdt",
     "//src:memiter",
     "//src/arch/${arch}:entry",
@@ -22,7 +22,7 @@
 source_set("other_vm") {
   deps = [
     "//src:common",
-    "//src:common_debug",
+    "//src:dlog",
     "//src/arch/${arch}:entry",
     "//src/arch/${arch}/vm:hf_call",
     "//src/arch/${arch}/vm:shutdown",