diff --git a/Package.swift b/Package.swift
index b7be427..7bff6d1 100644
--- a/Package.swift
+++ b/Package.swift
@@ -35,7 +35,7 @@ let package = Package(
                 ],
                 sources: [
                     "src/parser.c",
-                    // NOTE: if your language has an external scanner, add it here.
+                    "src/scanner.c",
                 ],
                 resources: [
                     .copy("queries")
diff --git a/binding.gyp b/binding.gyp
index bcb1715..4eb5370 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -11,7 +11,7 @@
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # NOTE: if your language has an external scanner, add it here.
+        "src/scanner.c",
       ],
       "conditions": [
         ["OS!='win'", {
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
index f2ce076..74e6cc0 100644
--- a/bindings/rust/build.rs
+++ b/bindings/rust/build.rs
@@ -11,8 +11,6 @@ fn main() {
     c_config.file(&parser_path);
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 
-    // NOTE: if your language uses an external scanner, uncomment this block:
-
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
diff --git a/help/Package.swift b/help/Package.swift
index 1002089..0a54cdb 100644
--- a/help/Package.swift
+++ b/help/Package.swift
@@ -35,7 +35,7 @@ let package = Package(
                 ],
                 sources: [
                     "src/parser.c",
-                    // NOTE: if your language has an external scanner, add it here.
+                    "src/scanner.c",
                 ],
                 resources: [
                     .copy("queries")
diff --git a/help/binding.gyp b/help/binding.gyp
index 06a9ea1..08af9fb 100644
--- a/help/binding.gyp
+++ b/help/binding.gyp
@@ -11,7 +11,7 @@
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # NOTE: if your language has an external scanner, add it here.
+        "src/scanner.c",
       ],
       "conditions": [
         ["OS!='win'", {
diff --git a/help/bindings/go/binding.go b/help/bindings/go/binding.go
index c11726e..a63339c 100644
--- a/help/bindings/go/binding.go
+++ b/help/bindings/go/binding.go
@@ -2,7 +2,7 @@ package tree_sitter_help
 
 // #cgo CFLAGS: -std=c11 -fPIC
 // #include "../../src/parser.c"
-// // NOTE: if your language has an external scanner, add it here.
+// #include "../../src/scanner.c"
 import "C"
 
 import "unsafe"
diff --git a/help/bindings/rust/build.rs b/help/bindings/rust/build.rs
index 4afc466..7ce2884 100644
--- a/help/bindings/rust/build.rs
+++ b/help/bindings/rust/build.rs
@@ -11,12 +11,9 @@ fn main() {
     c_config.file(&parser_path);
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
 
-    // NOTE: if your language uses an external scanner, uncomment this block:
-    /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 
     c_config.compile("tree-sitter-help");
 }
diff --git a/help/setup.py b/help/setup.py
index dcd992f..337969c 100644
--- a/help/setup.py
+++ b/help/setup.py
@@ -36,7 +36,7 @@ def get_tag(self):
             sources=[
                 "bindings/python/tree_sitter_help/binding.c",
                 "src/parser.c",
-                # NOTE: if your language uses an external scanner, add it here.
+                "src/scanner.c",
             ],
             extra_compile_args=[
                 "-std=c11",
diff --git a/test_on_cpp2_files.sh b/test_on_cpp2_files.sh
index f1a9c57..6bb549c 100755
--- a/test_on_cpp2_files.sh
+++ b/test_on_cpp2_files.sh
@@ -12,7 +12,7 @@ exclude_patterns=(
     "pure2-statement-parse-error.cpp2"
     "msvc-msstl-e.cpp2"
     "gcc-10-libstdc++-e.cpp2"
-    # "clang-12-libstdc++-e.cpp2"
+    "clang-12-libstdc++-e.cpp2"
 )
 
 find_command="find \"$search_dir\" -type f \( -name \"*.cpp2\" -o -name \"*.h2\" \)"