diff --git a/docs/third_party.md b/docs/third_party.md
index 267d9c9be4..c2f3b7af99 100644
--- a/docs/third_party.md
+++ b/docs/third_party.md
@@ -7,103 +7,112 @@ If you have a project that should be listed here, please
 
 ## Programming Languages
 
-These are projects we know about implementing Protocol Buffers for other
-programming languages: * Action Script:
-https://code.google.com/p/protobuf-actionscript3/ * Action Script:
-https://code.google.com/p/protoc-gen-as3/ * Action Script:
-https://github.com/matrix3d/JProtoc * Action Script:
-https://github.com/zhongfq/protobuf-as3/ * Ada:
-https://github.com/reznikmm/protobuf * C:
-https://github.com/protobuf-c/protobuf-c * C: https://koti.kapsi.fi/jpa/nanopb/
-* C: https://github.com/cloudwu/pbc/ * C: https://github.com/haberman/upb/wiki *
-C: https://github.com/squidfunk/protobluff * C:
-https://github.com/eerimoq/pbtools * C++:
-https://github.com/protocolbuffers/protobuf (Google-official implementation) *
-C++: https://github.com/yksten/struct2x * C++: https://EmbeddedProto.com *
-C/C++: http://spbc.sf.net/ * C#: https://code.google.com/p/protobuf-csharp-port
-* C#: https://silentorbit.com/protobuf/ * C#/.NET/WCF/VB:
-https://code.google.com/p/protobuf-net/ * Clojure:
-http://github.com/ninjudd/clojure-protobuf * Clojure:
-https://github.com/clojusc/protobuf * Clojure: https://protojure.readthedocs.io
-* Common Lisp: http://github.com/brown/protobuf * Common Lisp:
-http://github.com/qitab/cl-protobuf * D: https://github.com/dcarp/protobuf-d *
-D: https://github.com/msoucy/dproto * D:
-https://github.com/opticron/ProtocolBuffer * Dart:
-https://github.com/dart-lang/dart-protobuf (runtime)
-https://github.com/dart-lang/dart-protoc-plugin (code generator) * Delphi:
-http://sourceforge.net/projects/protobuf-delphi/ * Delphi:
-http://fundementals.sourceforge.net/dl.html * Elixir:
-https://github.com/jeremyong/exprotoc * Elixir:
-https://github.com/tony612/protobuf-elixir * Elixir:
-https://github.com/ahamez/protox * Elm:
-https://github.com/tiziano88/elm-protobuf * Erlang:
-https://github.com/tomas-abrahamsson/gpb * Erlang: http://piqi.org/ * Erlang:
-https://github.com/basho/erlang_protobuffs (no longer maintained, use gpb
-instead) * Hacklang/HHVM: https://github.com/y3llowcake/proto-hack * GDScript:
-https://github.com/oniksan/godobuf (Godot v3 engine plugin) * Go:
-https://github.com/golang/protobuf (Google-official implementation) * Go:
-https://github.com/akunspy/gopbuf * Go: https://github.com/gogo/protobuf *
-GopherJS: https://github.com/johanbrandhorst/protobuf * Haskell:
-https://hackage.haskell.org/package/hprotoc * Haskell:
-https://github.com/google/proto-lens (Google-unofficial implementation) *
-Haskell: https://github.com/awakesecurity/proto3-suite (code generator)
-https://github.com/awakesecurity/proto3-wire (binary serializer/deserializer) *
-Haxe: https://github.com/Atry/protoc-gen-haxe * Java:
-https://github.com/protocolbuffers/protobuf (Google-official implementation) *
-Java/Android: https://github.com/square/wire * Java:
-https://github.com/HebiRobotics/QuickBuffers/ * Java ME:
-https://code.google.com/p/protobuf-javame/ * Java ME:
-http://swingme.sourceforge.net/encode.shtml * Javascript:
-https://code.google.com/p/protobuf-js/ * Javascript:
-http://github.com/sirikata/protojs * Javascript:
-https://github.com/dcodeIO/ProtoBuf.js * Javascript:
-https://code.google.com/p/protobuf-for-node/ * Javascript:
-https://code.google.com/p/protostuff/ * Javascript:
-https://github.com/seishun/node-protoc-plugin (Node.js port of plugin.h) *
-Javascript: https://github.com/seishun/node-protoc-gen-javascript (Node.js port
-of the Google-official implementation) * Javascript:
-https://github.com/ButterCam/sisyphus-js * Julia:
-https://github.com/tanmaykm/ProtoBuf.jl * Kotlin:
-https://github.com/marcoferrer/kroto-plus * Kotlin:
-https://github.com/Kotlin/kotlinx.serialization * Kotlin:
-https://github.com/ButterCam/sisyphus * Kotlin:
-https://github.com/open-toast/protokt * Kotlin Multiplatform:
-https://github.com/streem/pbandk * Lua:
-https://code.google.com/p/protoc-gen-lua/ * Lua:
-http://github.com/indygreg/lua-protobuf * Lua:
-https://github.com/Neopallium/lua-pb * Matlab:
-https://code.google.com/p/protobuf-matlab/ * Mercury:
-https://code.google.com/p/protobuf-mercury/ * Objective C:
-https://code.google.com/p/protobuf-objc/ * Objective C:
-https://github.com/alexeyxo/protobuf-objc * OCaml: http://piqi.org/ * Perl:
-http://groups.google.com/group/protobuf-perl * Perl:
-https://metacpan.org/pod/Google::ProtocolBuffers * Perl:
-https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic * Perl/XS:
-https://code.google.com/p/protobuf-perlxs/ * PHP:
-https://code.google.com/p/pb4php/ * PHP:
-https://github.com/allegro/php-protobuf/ * PHP:
-https://github.com/chobie/php-protocolbuffers * Prolog:
-http://www.swi-prolog.org/pldoc/package/protobufs.html * Purescript:
-https://github.com/xc-jp/purescript-protobuf * Python:
-https://github.com/protocolbuffers/protobuf (Google-official implementation) *
-Python: https://github.com/eigenein/protobuf * Python:
-https://github.com/danielgtaylor/python-betterproto * R:
-http://cran.r-project.org/package=RProtoBuf * Ruby:
-https://code.google.com/p/ruby-protobuf/ * Ruby:
-http://github.com/mozy/ruby-protocol-buffers * Ruby:
-https://github.com/bmizerany/beefcake/tree/master/lib/beefcake * Ruby:
-https://github.com/localshred/protobuf * Rust: https://github.com/tokio-rs/prost
-* Rust: https://github.com/stepancheg/rust-protobuf/ * Rust:
-https://github.com/tafia/quick-protobuf * Scala:
-http://github.com/jeffplaisance/scala-protobuf * Scala:
-https://code.google.com/p/protobuf-scala * Scala:
-https://github.com/SandroGrzicic/ScalaBuff * Scala: https://scalapb.github.io *
-Solidity: https://github.com/celer-network/pb3-gen-sol * Swift:
-https://github.com/alexeyxo/protobuf-swift * Swift:
-https://github.com/apple/swift-protobuf/ * Typescript:
-https://github.com/thesayyn/protoc-gen-ts * Typescript:
-https://github.com/pbkit/pbkit * Vala: https://launchpad.net/protobuf-vala *
-Visual Basic: https://code.google.com/p/protobuf-net/
+These are projects we know about implementing Protocol Buffers for other programming languages:
+
+* Action Script: https://code.google.com/p/protobuf-actionscript3/
+* Action Script: https://code.google.com/p/protoc-gen-as3/
+* Action Script: https://github.com/matrix3d/JProtoc
+* Action Script: https://github.com/zhongfq/protobuf-as3/
+* Ada: https://github.com/reznikmm/protobuf
+* C: https://github.com/protobuf-c/protobuf-c
+* C: https://koti.kapsi.fi/jpa/nanopb/
+* C: https://github.com/cloudwu/pbc/
+* C: https://github.com/haberman/upb/wiki
+* C: https://github.com/squidfunk/protobluff
+* C: https://github.com/eerimoq/pbtools
+* C++: https://github.com/protocolbuffers/protobuf (Google-official implementation)
+* C++: https://EmbeddedProto.com
+* C++: https://github.com/yksten/struct2x
+* C/C++: http://spbc.sf.net/
+* C#: https://code.google.com/p/protobuf-csharp-port
+* C#: https://silentorbit.com/protobuf/
+* C#/.NET/WCF/VB: https://code.google.com/p/protobuf-net/
+* Clojure: http://github.com/ninjudd/clojure-protobuf
+* Clojure: https://github.com/clojusc/protobuf
+* Clojure: https://protojure.readthedocs.io
+* Common Lisp: http://github.com/brown/protobuf
+* Common Lisp: http://github.com/qitab/cl-protobuf
+* D: https://github.com/dcarp/protobuf-d
+* D: https://github.com/msoucy/dproto
+* D: https://github.com/opticron/ProtocolBuffer
+* Dart: https://github.com/dart-lang/dart-protobuf (runtime) https://github.com/dart-lang/dart-protoc-plugin (code generator)
+* Delphi: http://sourceforge.net/projects/protobuf-delphi/
+* Delphi: http://fundementals.sourceforge.net/dl.html
+* Elixir: https://github.com/jeremyong/exprotoc
+* Elixir: https://github.com/tony612/protobuf-elixir
+* Elixir: https://github.com/ahamez/protox
+* Elm: https://github.com/tiziano88/elm-protobuf
+* Erlang: https://github.com/tomas-abrahamsson/gpb
+* Erlang: http://piqi.org/
+* Erlang: https://github.com/basho/erlang_protobuffs (no longer maintained, use gpb instead)
+* Hacklang/HHVM: https://github.com/y3llowcake/proto-hack
+* GDScript: https://github.com/oniksan/godobuf (Godot v3 engine plugin)
+* Go: https://github.com/golang/protobuf (Google-official implementation)
+* Go: https://github.com/akunspy/gopbuf
+* Go: https://github.com/gogo/protobuf
+* GopherJS: https://github.com/johanbrandhorst/protobuf
+* Haskell: https://hackage.haskell.org/package/hprotoc
+* Haskell: https://github.com/google/proto-lens (Google-unofficial implementation)
+* Haskell: https://github.com/awakesecurity/proto3-suite (code generator) https://github.com/awakesecurity/proto3-wire (binary serializer/deserializer)
+* Haxe: https://github.com/Atry/protoc-gen-haxe
+* Java: https://github.com/protocolbuffers/protobuf (Google-official implementation)
+* Java/Android: https://github.com/square/wire
+* Java: https://github.com/HebiRobotics/QuickBuffers/
+* Java ME: https://code.google.com/p/protobuf-javame/
+* Java ME: http://swingme.sourceforge.net/encode.shtml
+* Javascript: https://code.google.com/p/protobuf-js/
+* Javascript: http://github.com/sirikata/protojs
+* Javascript: https://github.com/dcodeIO/ProtoBuf.js
+* Javascript: https://code.google.com/p/protobuf-for-node/
+* Javascript: https://code.google.com/p/protostuff/
+* Javascript: https://github.com/seishun/node-protoc-plugin (Node.js port of plugin.h)
+* Javascript: https://github.com/seishun/node-protoc-gen-javascript (Node.js port of the Google-official implementation)
+* Javascript: https://github.com/ButterCam/sisyphus-js
+* Julia: https://github.com/tanmaykm/ProtoBuf.jl
+* Kotlin: https://github.com/marcoferrer/kroto-plus
+* Kotlin: https://github.com/Kotlin/kotlinx.serialization
+* Kotlin: https://github.com/ButterCam/sisyphus
+* Kotlin: https://github.com/open-toast/protokt
+* Kotlin Multiplatform: https://github.com/streem/pbandk
+* Lua: https://code.google.com/p/protoc-gen-lua/
+* Lua: http://github.com/indygreg/lua-protobuf
+* Lua: https://github.com/Neopallium/lua-pb
+* Matlab: https://code.google.com/p/protobuf-matlab/
+* Mercury: https://code.google.com/p/protobuf-mercury/
+* Objective C: https://code.google.com/p/protobuf-objc/
+* Objective C: https://github.com/alexeyxo/protobuf-objc
+* OCaml: http://piqi.org/
+* Perl: http://groups.google.com/group/protobuf-perl
+* Perl: https://metacpan.org/pod/Google::ProtocolBuffers
+* Perl: https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
+* Perl/XS: https://code.google.com/p/protobuf-perlxs/
+* PHP: https://code.google.com/p/pb4php/
+* PHP: https://github.com/allegro/php-protobuf/
+* PHP: https://github.com/chobie/php-protocolbuffers
+* Prolog: http://www.swi-prolog.org/pldoc/package/protobufs.html
+* Purescript: https://github.com/xc-jp/purescript-protobuf
+* Python: https://github.com/protocolbuffers/protobuf (Google-official implementation)
+* Python: https://github.com/eigenein/protobuf
+* Python: https://github.com/danielgtaylor/python-betterproto
+* R: http://cran.r-project.org/package=RProtoBuf
+* Ruby: https://code.google.com/p/ruby-protobuf/
+* Ruby: http://github.com/mozy/ruby-protocol-buffers
+* Ruby: https://github.com/bmizerany/beefcake/tree/master/lib/beefcake
+* Ruby: https://github.com/localshred/protobuf
+* Rust: https://github.com/tokio-rs/prost
+* Rust: https://github.com/stepancheg/rust-protobuf/
+* Rust: https://github.com/tafia/quick-protobuf
+* Scala: http://github.com/jeffplaisance/scala-protobuf
+* Scala: https://code.google.com/p/protobuf-scala
+* Scala: https://github.com/SandroGrzicic/ScalaBuff
+* Scala: https://scalapb.github.io
+* Solidity: https://github.com/celer-network/pb3-gen-sol
+* Swift: https://github.com/alexeyxo/protobuf-swift
+* Swift: https://github.com/apple/swift-protobuf/
+* Typescript: https://github.com/thesayyn/protoc-gen-ts
+* Typescript: https://github.com/pbkit/pbkit
+* Vala: https://launchpad.net/protobuf-vala
+* Visual Basic: https://code.google.com/p/protobuf-net/
 
 ## RPC Implementations
 
diff --git a/src/file_lists.cmake b/src/file_lists.cmake
index bb4114cee7..e903305820 100644
--- a/src/file_lists.cmake
+++ b/src/file_lists.cmake
@@ -1,4 +1,4 @@
-# Auto-generated by @//pkg:gen_src_file_lists_cmake
+# Auto-generated by //pkg:gen_src_file_lists_cmake
 #
 # This file contains lists of sources based on Bazel rules. It should
 # be included from a hand-written CMake file that defines targets.
@@ -9,7 +9,7 @@ if(${CMAKE_VERSION} VERSION_GREATER 3.10 OR ${CMAKE_VERSION} VERSION_EQUAL 3.10)
   include_guard()
 endif()
 
-# @//pkg:protobuf
+# //pkg:protobuf
 set(libprotobuf_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.cc
@@ -85,7 +85,7 @@ set(libprotobuf_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc
 )
 
-# @//pkg:protobuf
+# //pkg:protobuf
 set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.h
@@ -192,7 +192,7 @@ set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h
 )
 
-# @//pkg:protobuf_lite
+# //pkg:protobuf_lite
 set(libprotobuf_lite_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_lite.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
@@ -220,7 +220,7 @@ set(libprotobuf_lite_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc
 )
 
-# @//pkg:protobuf_lite
+# //pkg:protobuf_lite
 set(libprotobuf_lite_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h
@@ -270,7 +270,7 @@ set(libprotobuf_lite_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h
 )
 
-# @//pkg:protoc
+# //pkg:protoc
 set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
@@ -366,7 +366,7 @@ set(libprotoc_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc
 )
 
-# @//pkg:protoc
+# //pkg:protoc
 set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
@@ -388,7 +388,6 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/tracker.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.h
@@ -470,7 +469,7 @@ set(libprotoc_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.h
 )
 
-# @//src/google/protobuf:well_known_type_protos
+# //src/google/protobuf:well_known_type_protos
 set(wkt_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/api.proto
@@ -484,68 +483,68 @@ set(wkt_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.proto
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.cc
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.h
 )
 
-# @//src/google/protobuf:descriptor_proto
+# //src/google/protobuf:descriptor_proto
 set(descriptor_proto_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_proto-descriptor-set.proto.bin
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.cc
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.h
 )
 
-# @//src/google/protobuf/compiler:plugin_proto
+# //src/google/protobuf/compiler:plugin_proto
 set(plugin_proto_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin_proto-descriptor-set.proto.bin
 )
 
-# @//pkg:common_test
+# //pkg:common_test
 set(common_test_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.cc
 )
 
-# @//pkg:common_test
+# //pkg:common_test
 set(common_test_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.h
 )
 
-# @//pkg:lite_test_util
+# //pkg:lite_test_util
 set(lite_test_util_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.cc
 )
 
-# @//pkg:lite_test_util
+# //pkg:lite_test_util
 set(lite_test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.h
@@ -556,14 +555,14 @@ set(lite_test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.h
 )
 
-# @//pkg:test_util
+# //pkg:test_util
 set(test_util_srcs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.cc
 )
 
-# @//pkg:test_util
+# //pkg:test_util
 set(test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.h
@@ -578,7 +577,7 @@ set(test_util_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.inc
 )
 
-# @//src/google/protobuf:full_test_srcs
+# //src/google/protobuf:full_test_srcs
 set(protobuf_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_align_test.cc
@@ -610,7 +609,7 @@ set(protobuf_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.cc
 )
 
-# @//src/google/protobuf:test_proto_srcs
+# //src/google/protobuf:test_proto_srcs
 set(protobuf_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto
@@ -643,13 +642,13 @@ set(protobuf_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto
 )
 
-# @//src/google/protobuf:lite_test_srcs
+# //src/google/protobuf:lite_test_srcs
 set(protobuf_lite_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_arena_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_unittest.cc
 )
 
-# @//src/google/protobuf:lite_test_proto_srcs
+# //src/google/protobuf:lite_test_proto_srcs
 set(protobuf_lite_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto
@@ -657,7 +656,7 @@ set(protobuf_lite_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto
 )
 
-# @//src/google/protobuf/compiler:test_srcs
+# //src/google/protobuf/compiler:test_srcs
 set(compiler_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
@@ -680,18 +679,18 @@ set(compiler_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
 )
 
-# @//src/google/protobuf/compiler:test_proto_srcs
+# //src/google/protobuf/compiler:test_proto_srcs
 set(compiler_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
 )
 
-# @//src/google/protobuf/compiler:test_plugin_srcs
+# //src/google/protobuf/compiler:test_plugin_srcs
 set(test_plugin_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/test_plugin.cc
 )
 
-# @//src/google/protobuf/io:test_srcs
+# //src/google/protobuf/io:test_srcs
 set(io_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream_unittest.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32_unittest.cc
@@ -702,7 +701,7 @@ set(io_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_unittest.cc
 )
 
-# @//src/google/protobuf/util:test_srcs
+# //src/google/protobuf/util:test_srcs
 set(util_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util_test.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator_test.cc
@@ -712,14 +711,14 @@ set(util_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util_test.cc
 )
 
-# @//src/google/protobuf/util:test_proto_srcs
+# //src/google/protobuf/util:test_proto_srcs
 set(util_test_protos_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format_proto3.proto
   ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.proto
 )
 
-# @//src/google/protobuf/stubs:test_srcs
+# //src/google/protobuf/stubs:test_srcs
 set(stubs_test_files
   ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common_unittest.cc
 )