diff --git a/.cargo/config.toml b/.cargo/config.toml
index cff486357e..faf10b9677 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,6 +1,5 @@
 [build]
 rustflags = [
-    # "--cfg", "windows_debugger_visualizer",
     # "--cfg", "windows_raw_dylib",
     # "-C", "target-feature=+crt-static",
 ]
diff --git a/.github/workflows/debugger_visualizer.yml b/.github/workflows/debugger_visualizer.yml
index 856eeeaf6b..fdb2e04106 100644
--- a/.github/workflows/debugger_visualizer.yml
+++ b/.github/workflows/debugger_visualizer.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 env:
-  RUSTFLAGS: -Dwarnings --cfg windows_debugger_visualizer
+  RUSTFLAGS: -Dwarnings
 
 jobs:
   check:
diff --git a/Cargo.toml b/Cargo.toml
index 00ab9b32b3..05325ca850 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,4 +16,4 @@ exclude = [
 [workspace.lints.rust]
 rust_2018_idioms = { level = "warn", priority = -1 }
 missing_docs = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_raw_dylib, windows_debugger_visualizer)'] }
+unexpected_cfgs = { level = "warn" }
diff --git a/crates/libs/core/src/lib.rs b/crates/libs/core/src/lib.rs
index 25708a4c6d..4be6160f87 100644
--- a/crates/libs/core/src/lib.rs
+++ b/crates/libs/core/src/lib.rs
@@ -4,10 +4,7 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs
 
 #![doc(html_no_source)]
 #![allow(non_snake_case)]
-#![cfg_attr(
-    windows_debugger_visualizer,
-    debugger_visualizer(natvis_file = "../.natvis")
-)]
+#![debugger_visualizer(natvis_file = "../.natvis")]
 #![cfg_attr(all(not(test), not(feature = "std")), no_std)]
 
 extern crate self as windows_core;
diff --git a/crates/libs/result/src/lib.rs b/crates/libs/result/src/lib.rs
index df5cd6d97f..c99179b535 100644
--- a/crates/libs/result/src/lib.rs
+++ b/crates/libs/result/src/lib.rs
@@ -2,10 +2,7 @@
 Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs>
 */
 
-#![cfg_attr(
-    windows_debugger_visualizer,
-    debugger_visualizer(natvis_file = "../.natvis")
-)]
+#![debugger_visualizer(natvis_file = "../.natvis")]
 #![cfg_attr(all(not(test), not(feature = "std")), no_std)]
 #![cfg_attr(not(windows), allow(unused_imports))]
 
diff --git a/crates/libs/targets/Cargo.toml b/crates/libs/targets/Cargo.toml
index 49d06e6d4f..6015126ed9 100644
--- a/crates/libs/targets/Cargo.toml
+++ b/crates/libs/targets/Cargo.toml
@@ -10,8 +10,10 @@ description = "Import libs for Windows"
 repository = "https://github.com/microsoft/windows-rs"
 readme = "readme.md"
 
-[lints]
-workspace = true
+[lints.rust]
+rust_2018_idioms = { level = "warn", priority = -1 }
+missing_docs = "warn"
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_raw_dylib)'] }
 
 [target.'cfg(all(target_arch = "x86", target_env = "msvc", not(windows_raw_dylib)))'.dependencies]
 windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.52.5" }
diff --git a/crates/tests/debugger_visualizer/Cargo.toml b/crates/tests/debugger_visualizer/Cargo.toml
index 73b67d5370..a6cf7945cb 100644
--- a/crates/tests/debugger_visualizer/Cargo.toml
+++ b/crates/tests/debugger_visualizer/Cargo.toml
@@ -9,7 +9,7 @@ doc = false
 doctest = false
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(windows_debugger_visualizer)'] }
+unexpected_cfgs = { level = "warn" }
 
 [dependencies.windows]
 path = "../../libs/windows"
diff --git a/crates/tests/debugger_visualizer/tests/test.rs b/crates/tests/debugger_visualizer/tests/test.rs
index 4f264112ad..d4a807beb3 100644
--- a/crates/tests/debugger_visualizer/tests/test.rs
+++ b/crates/tests/debugger_visualizer/tests/test.rs
@@ -1,4 +1,4 @@
-#![cfg(windows_debugger_visualizer)]
+#![cfg(windows)]
 
 use debugger_test::*;
 use windows::core::*;