diff --git a/include/slang/ast/ASTVisitor.h b/include/slang/ast/ASTVisitor.h
index 1f8162cee..6bb5b5601 100644
--- a/include/slang/ast/ASTVisitor.h
+++ b/include/slang/ast/ASTVisitor.h
@@ -9,7 +9,6 @@
 
 #include "slang/ast/Constraints.h"
 #include "slang/ast/Patterns.h"
-#include "slang/ast/Statements.h"
 #include "slang/ast/TimingControl.h"
 #include "slang/ast/expressions/AssertionExpr.h"
 #include "slang/ast/expressions/AssignmentExpressions.h"
diff --git a/include/slang/ast/Statements.h b/include/slang/ast/Statement.h
similarity index 99%
rename from include/slang/ast/Statements.h
rename to include/slang/ast/Statement.h
index 74f560cd1..e5d881665 100644
--- a/include/slang/ast/Statements.h
+++ b/include/slang/ast/Statement.h
@@ -1,5 +1,5 @@
 //------------------------------------------------------------------------------
-//! @file Statements.h
+//! @file Statement.h
 //! @brief Statement creation and analysis
 //
 // SPDX-FileCopyrightText: Michael Popoloski
diff --git a/include/slang/ast/statements/ConditionalStatements.h b/include/slang/ast/statements/ConditionalStatements.h
index 81c0c4e62..2bed0a07b 100644
--- a/include/slang/ast/statements/ConditionalStatements.h
+++ b/include/slang/ast/statements/ConditionalStatements.h
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 #pragma once
 
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 
 namespace slang::ast {
 
diff --git a/include/slang/ast/statements/LoopStatements.h b/include/slang/ast/statements/LoopStatements.h
index 92b88c73c..1dc1999e7 100644
--- a/include/slang/ast/statements/LoopStatements.h
+++ b/include/slang/ast/statements/LoopStatements.h
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 #pragma once
 
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 
 namespace slang::ast {
 
diff --git a/include/slang/ast/statements/MiscStatements.h b/include/slang/ast/statements/MiscStatements.h
index c68eda8af..0f47d6b65 100644
--- a/include/slang/ast/statements/MiscStatements.h
+++ b/include/slang/ast/statements/MiscStatements.h
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 #pragma once
 
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 
 namespace slang::ast {
 
diff --git a/include/slang/ast/symbols/BlockSymbols.h b/include/slang/ast/symbols/BlockSymbols.h
index ef08076ec..c0e7d5dae 100644
--- a/include/slang/ast/symbols/BlockSymbols.h
+++ b/include/slang/ast/symbols/BlockSymbols.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "slang/ast/SemanticFacts.h"
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 #include "slang/ast/Symbol.h"
 #include "slang/syntax/SyntaxFwd.h"
 #include "slang/util/Function.h"
diff --git a/include/slang/ast/symbols/SubroutineSymbols.h b/include/slang/ast/symbols/SubroutineSymbols.h
index 88b042bbb..9bb655d94 100644
--- a/include/slang/ast/symbols/SubroutineSymbols.h
+++ b/include/slang/ast/symbols/SubroutineSymbols.h
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 #pragma once
 
-#include "slang/ast/Statements.h"
+#include "slang/ast/Scope.h"
 #include "slang/ast/types/DeclaredType.h"
 #include "slang/syntax/SyntaxFwd.h"
 #include "slang/util/Enum.h"
@@ -15,6 +15,8 @@
 namespace slang::ast {
 
 class FormalArgumentSymbol;
+class Statement;
+class StatementBlockSymbol;
 class VariableSymbol;
 
 /// Specifies various flags that can apply to subroutines.
diff --git a/source/ast/CMakeLists.txt b/source/ast/CMakeLists.txt
index 94aaf8be1..527d17bbb 100644
--- a/source/ast/CMakeLists.txt
+++ b/source/ast/CMakeLists.txt
@@ -66,7 +66,7 @@ target_sources(
           ScriptSession.cpp
           SemanticFacts.cpp
           SFormat.cpp
-          Statements.cpp
+          Statement.cpp
           Symbol.cpp
           SystemSubroutine.cpp
           TimingControl.cpp)
diff --git a/source/ast/ScriptSession.cpp b/source/ast/ScriptSession.cpp
index 58f782de3..45be8c3bb 100644
--- a/source/ast/ScriptSession.cpp
+++ b/source/ast/ScriptSession.cpp
@@ -8,7 +8,7 @@
 #include "slang/ast/ScriptSession.h"
 
 #include "slang/ast/Expression.h"
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 #include "slang/ast/symbols/BlockSymbols.h"
 #include "slang/ast/symbols/CompilationUnitSymbols.h"
 #include "slang/ast/symbols/VariableSymbols.h"
diff --git a/source/ast/Statements.cpp b/source/ast/Statement.cpp
similarity index 99%
rename from source/ast/Statements.cpp
rename to source/ast/Statement.cpp
index 84050127a..762f35abb 100644
--- a/source/ast/Statements.cpp
+++ b/source/ast/Statement.cpp
@@ -1,11 +1,11 @@
 //------------------------------------------------------------------------------
-// Statements.cpp
+// Statement.cpp
 // Statement creation and analysis
 //
 // SPDX-FileCopyrightText: Michael Popoloski
 // SPDX-License-Identifier: MIT
 //------------------------------------------------------------------------------
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 
 #include "slang/ast/ASTSerializer.h"
 #include "slang/ast/ASTVisitor.h"
diff --git a/tests/unittests/ast/MemberTests.cpp b/tests/unittests/ast/MemberTests.cpp
index d43c28c1d..1f3ef6f1b 100644
--- a/tests/unittests/ast/MemberTests.cpp
+++ b/tests/unittests/ast/MemberTests.cpp
@@ -4,7 +4,7 @@
 #include "Test.h"
 
 #include "slang/ast/ASTVisitor.h"
-#include "slang/ast/Statements.h"
+#include "slang/ast/Statement.h"
 #include "slang/ast/expressions/AssignmentExpressions.h"
 #include "slang/ast/expressions/CallExpression.h"
 #include "slang/ast/expressions/OperatorExpressions.h"