diff --git a/scripts/tundra/ide/ide-common.lua b/scripts/tundra/ide/ide-common.lua
index 25edb9c3..f3bd5ee0 100644
--- a/scripts/tundra/ide/ide-common.lua
+++ b/scripts/tundra/ide/ide-common.lua
@@ -15,7 +15,7 @@ binary_extension = util.make_lookup_table {
 }
 
 header_exts = util.make_lookup_table {
-  ".h", ".hpp", ".hh", ".inl",
+  ".h", ".hpp", ".hh", ".inl", ".natvis",
 }
 
 
diff --git a/scripts/tundra/ide/msvc-common.lua b/scripts/tundra/ide/msvc-common.lua
index c55ca969..c8c9269e 100644
--- a/scripts/tundra/ide/msvc-common.lua
+++ b/scripts/tundra/ide/msvc-common.lua
@@ -291,6 +291,7 @@ local cl_tags = {
   ['.hh']  = 'ClInclude',
   ['.hpp'] = 'ClInclude',
   ['.inl'] = 'ClInclude',
+  ['.natvis'] = 'Natvis',
 }
 
 function msvc_generator:generate_solution(fn, projects, ext_projects, solution)
diff --git a/scripts/tundra/tools/generic-cpp.lua b/scripts/tundra/tools/generic-cpp.lua
index 964f2a74..d68dc6c1 100644
--- a/scripts/tundra/tools/generic-cpp.lua
+++ b/scripts/tundra/tools/generic-cpp.lua
@@ -84,7 +84,7 @@ function apply(_outer_env, options)
   _outer_env:add_setup_function(generic_cpp_setup)
 
   _outer_env:set_many {
-    ["IGNORED_AUTOEXTS"] = { ".h", ".hpp", ".hh", ".hxx", ".inl" },
+    ["IGNORED_AUTOEXTS"] = { ".h", ".hpp", ".hh", ".hxx", ".inl", ".natvis" },
     ["CCEXTS"] = { "c" },
     ["CXXEXTS"] = { "cpp", "cxx", "cc" },
     ["OBJCEXTS"] = { "m" },