diff --git a/toolchain/check/node_stack.h b/toolchain/check/node_stack.h
index e97d148f26db..a1ac04c95979 100644
--- a/toolchain/check/node_stack.h
+++ b/toolchain/check/node_stack.h
@@ -10,7 +10,6 @@
 #include "toolchain/parse/node_ids.h"
 #include "toolchain/parse/node_kind.h"
 #include "toolchain/parse/tree.h"
-#include "toolchain/parse/typed_nodes.h"
 #include "toolchain/sem_ir/id_kind.h"
 #include "toolchain/sem_ir/ids.h"
 
diff --git a/toolchain/parse/tree.h b/toolchain/parse/tree.h
index b1c2ffdeedf4..aa92e2862989 100644
--- a/toolchain/parse/tree.h
+++ b/toolchain/parse/tree.h
@@ -17,7 +17,6 @@
 #include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/node_ids.h"
 #include "toolchain/parse/node_kind.h"
-#include "toolchain/parse/typed_nodes.h"
 
 namespace Carbon::Parse {
 
diff --git a/toolchain/parse/tree_and_subtrees.cpp b/toolchain/parse/tree_and_subtrees.cpp
index 081dbf4aae37..cbb2e8b2ab34 100644
--- a/toolchain/parse/tree_and_subtrees.cpp
+++ b/toolchain/parse/tree_and_subtrees.cpp
@@ -9,6 +9,7 @@
 
 #include "toolchain/base/fixed_size_value_store.h"
 #include "toolchain/lex/token_index.h"
+#include "toolchain/parse/typed_nodes.h"
 
 namespace Carbon::Parse {