diff --git a/BUILD.gn b/BUILD.gn
index 64f8571..a2ec171 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -64,14 +64,14 @@
   ]
 
   if (host_os != "win") {
-    # TODO(frolv): Remove this when new KVS is ready.
     deps += [
+      # TODO(frolv): Remove these two when new KVS is ready.
       "$dir_pw_kvs",
       "$dir_pw_minimal_cpp_stdlib",
-    ]
 
-    # TODO(pwbug/111): Remove this when building successfully on Windows.
-    deps += [ "$dir_pw_tokenizer" ]
+      # TODO(pwbug/111): Remove this when building successfully on Windows.
+      "$dir_pw_tokenizer",
+    ]
   }
 }
 
@@ -97,13 +97,13 @@
   }
 
   if (host_os != "win") {
-    # TODO(frolv): Remove this when new KVS is ready.
     group_deps += [
+      # TODO(frolv): Remove these two when new KVS is ready.
       "$dir_pw_kvs:tests",
       "$dir_pw_minimal_cpp_stdlib:tests",
-    ]
 
-    # TODO(pwbug/111): Remove this when building successfully on Windows.
-    group_deps += [ "$dir_pw_tokenizer:tests" ]
+      # TODO(pwbug/111): Remove this when building successfully on Windows.
+      "$dir_pw_tokenizer:tests",
+    ]
   }
 }