diff --git a/runtime/Cpp/runtime/src/ANTLRErrorListener.h b/runtime/Cpp/runtime/src/ANTLRErrorListener.h
index 81c7b59871..d85458d921 100644
--- a/runtime/Cpp/runtime/src/ANTLRErrorListener.h
+++ b/runtime/Cpp/runtime/src/ANTLRErrorListener.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "RecognitionException.h"
 
 namespace antlrcpp {
diff --git a/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h b/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h
index 694c94f8ba..31a6aa0ad5 100644
--- a/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h
+++ b/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h
@@ -9,6 +9,7 @@
 #include "Token.h"
 
 namespace antlr4 {
+  class Parser;
 
   /// <summary>
   /// The interface for defining strategies to deal with syntax errors encountered
diff --git a/runtime/Cpp/runtime/src/ANTLRFileStream.cpp b/runtime/Cpp/runtime/src/ANTLRFileStream.cpp
index 5a7bc1342d..853a3d08bb 100644
--- a/runtime/Cpp/runtime/src/ANTLRFileStream.cpp
+++ b/runtime/Cpp/runtime/src/ANTLRFileStream.cpp
@@ -4,6 +4,7 @@
  */
 
 #include <string>
+#include "ANTLRInputStream.h"
 #include "ANTLRFileStream.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/ANTLRInputStream.h b/runtime/Cpp/runtime/src/ANTLRInputStream.h
index 8f95e38995..f7011dac83 100644
--- a/runtime/Cpp/runtime/src/ANTLRInputStream.h
+++ b/runtime/Cpp/runtime/src/ANTLRInputStream.h
@@ -10,6 +10,7 @@
 #include <string_view>
 
 #include "antlr4-common.h"
+#include "misc/Interval.h"
 #include "CharStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/BailErrorStrategy.cpp b/runtime/Cpp/runtime/src/BailErrorStrategy.cpp
old mode 100755
new mode 100644
index 5fbc011611..3bb19f5e74
--- a/runtime/Cpp/runtime/src/BailErrorStrategy.cpp
+++ b/runtime/Cpp/runtime/src/BailErrorStrategy.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "Exceptions.h"
+#include "Token.h"
 #include "ParserRuleContext.h"
 #include "InputMismatchException.h"
 #include "Parser.h"
diff --git a/runtime/Cpp/runtime/src/BailErrorStrategy.h b/runtime/Cpp/runtime/src/BailErrorStrategy.h
index 666aa5dcac..bc14a4024f 100644
--- a/runtime/Cpp/runtime/src/BailErrorStrategy.h
+++ b/runtime/Cpp/runtime/src/BailErrorStrategy.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "Token.h"
 #include "DefaultErrorStrategy.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/BaseErrorListener.cpp b/runtime/Cpp/runtime/src/BaseErrorListener.cpp
index 62435eef42..38f79a42f7 100644
--- a/runtime/Cpp/runtime/src/BaseErrorListener.cpp
+++ b/runtime/Cpp/runtime/src/BaseErrorListener.cpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <cstddef>
 #include "BaseErrorListener.h"
+#include "Token.h"
 #include "RecognitionException.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/BaseErrorListener.h b/runtime/Cpp/runtime/src/BaseErrorListener.h
index f9ee9000c4..d68b6807b8 100644
--- a/runtime/Cpp/runtime/src/BaseErrorListener.h
+++ b/runtime/Cpp/runtime/src/BaseErrorListener.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "ANTLRErrorListener.h"
 
 namespace antlrcpp {
diff --git a/runtime/Cpp/runtime/src/BufferedTokenStream.cpp b/runtime/Cpp/runtime/src/BufferedTokenStream.cpp
index ff0ee0e015..27861856fd 100644
--- a/runtime/Cpp/runtime/src/BufferedTokenStream.cpp
+++ b/runtime/Cpp/runtime/src/BufferedTokenStream.cpp
@@ -9,6 +9,7 @@
 #include <vector>
 #include <cstddef>
 #include "WritableToken.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "Lexer.h"
 #include "RuleContext.h"
diff --git a/runtime/Cpp/runtime/src/BufferedTokenStream.h b/runtime/Cpp/runtime/src/BufferedTokenStream.h
index 9a723ede6f..5d3cdbf7ec 100644
--- a/runtime/Cpp/runtime/src/BufferedTokenStream.h
+++ b/runtime/Cpp/runtime/src/BufferedTokenStream.h
@@ -10,6 +10,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "TokenStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/CommonToken.cpp b/runtime/Cpp/runtime/src/CommonToken.cpp
index 7eb3dd9d33..e25d5b6429 100644
--- a/runtime/Cpp/runtime/src/CommonToken.cpp
+++ b/runtime/Cpp/runtime/src/CommonToken.cpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <cstddef>
 #include "TokenSource.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "CharStream.h"
 #include "Recognizer.h"
diff --git a/runtime/Cpp/runtime/src/CommonToken.h b/runtime/Cpp/runtime/src/CommonToken.h
index aef77258e9..9e5a5c0c5b 100644
--- a/runtime/Cpp/runtime/src/CommonToken.h
+++ b/runtime/Cpp/runtime/src/CommonToken.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "WritableToken.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/CommonTokenStream.h b/runtime/Cpp/runtime/src/CommonTokenStream.h
index 869f1a311c..a68f33e972 100644
--- a/runtime/Cpp/runtime/src/CommonTokenStream.h
+++ b/runtime/Cpp/runtime/src/CommonTokenStream.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "BufferedTokenStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp b/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp
index 5325746381..f6f548f7f5 100644
--- a/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp
+++ b/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <cstddef>
+#include "Token.h"
 #include "ConsoleErrorListener.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/ConsoleErrorListener.h b/runtime/Cpp/runtime/src/ConsoleErrorListener.h
index 8291f212e4..a24b38a737 100644
--- a/runtime/Cpp/runtime/src/ConsoleErrorListener.h
+++ b/runtime/Cpp/runtime/src/ConsoleErrorListener.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "BaseErrorListener.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp b/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
index 2c7a26a8e4..0912a31711 100644
--- a/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
+++ b/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <cstddef>
 #include "NoViableAltException.h"
+#include "atn/ATNStateType.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "misc/IntervalSet.h"
 #include "atn/ParserATNSimulator.h"
diff --git a/runtime/Cpp/runtime/src/DefaultErrorStrategy.h b/runtime/Cpp/runtime/src/DefaultErrorStrategy.h
index b52ff671f1..7de68dd35b 100644
--- a/runtime/Cpp/runtime/src/DefaultErrorStrategy.h
+++ b/runtime/Cpp/runtime/src/DefaultErrorStrategy.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <cstddef>
 #include "ANTLRErrorStrategy.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "misc/IntervalSet.h"
 
diff --git a/runtime/Cpp/runtime/src/FailedPredicateException.cpp b/runtime/Cpp/runtime/src/FailedPredicateException.cpp
index dcb070e386..1313bcd265 100644
--- a/runtime/Cpp/runtime/src/FailedPredicateException.cpp
+++ b/runtime/Cpp/runtime/src/FailedPredicateException.cpp
@@ -5,6 +5,7 @@
 
 #include <cstddef>
 #include "atn/ParserATNSimulator.h"
+#include "atn/TransitionType.h"
 #include "Parser.h"
 #include "atn/PredicateTransition.h"
 #include "atn/ATN.h"
diff --git a/runtime/Cpp/runtime/src/Lexer.cpp b/runtime/Cpp/runtime/src/Lexer.cpp
index 6af5be43a7..cbd3b65cc0 100644
--- a/runtime/Cpp/runtime/src/Lexer.cpp
+++ b/runtime/Cpp/runtime/src/Lexer.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 #include <cstddef>
 #include "atn/LexerATNSimulator.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "Exceptions.h"
 #include "misc/Interval.h"
diff --git a/runtime/Cpp/runtime/src/ListTokenSource.h b/runtime/Cpp/runtime/src/ListTokenSource.h
index 45602009e4..0960def4d5 100644
--- a/runtime/Cpp/runtime/src/ListTokenSource.h
+++ b/runtime/Cpp/runtime/src/ListTokenSource.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <cstddef>
 #include "TokenSource.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "CommonTokenFactory.h"
 
diff --git a/runtime/Cpp/runtime/src/NoViableAltException.cpp b/runtime/Cpp/runtime/src/NoViableAltException.cpp
index 68e22752e2..86dd06f609 100644
--- a/runtime/Cpp/runtime/src/NoViableAltException.cpp
+++ b/runtime/Cpp/runtime/src/NoViableAltException.cpp
@@ -5,6 +5,7 @@
 
 #include "Parser.h"
 
+#include "Token.h"
 #include "antlr4-common.h"
 #include "NoViableAltException.h"
 
diff --git a/runtime/Cpp/runtime/src/Parser.cpp b/runtime/Cpp/runtime/src/Parser.cpp
index d6cd2e9d8d..ac50325e4f 100644
--- a/runtime/Cpp/runtime/src/Parser.cpp
+++ b/runtime/Cpp/runtime/src/Parser.cpp
@@ -9,6 +9,8 @@
 #include <vector>
 #include <cstddef>
 #include "atn/ATNDeserializationOptions.h"
+#include "ANTLRErrorStrategy.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "tree/pattern/ParseTreePatternMatcher.h"
 #include "dfa/DFA.h"
diff --git a/runtime/Cpp/runtime/src/Parser.h b/runtime/Cpp/runtime/src/Parser.h
index e933e3a2a3..57bc2c19c3 100644
--- a/runtime/Cpp/runtime/src/Parser.h
+++ b/runtime/Cpp/runtime/src/Parser.h
@@ -9,6 +9,9 @@
 #include <string>
 #include <cstddef>
 #include "Recognizer.h"
+#include "misc/IntervalSet.h"
+#include "ANTLRErrorStrategy.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "tree/ParseTreeListener.h"
 #include "tree/ParseTree.h"
diff --git a/runtime/Cpp/runtime/src/ParserInterpreter.cpp b/runtime/Cpp/runtime/src/ParserInterpreter.cpp
index 723941772e..f95960f5c0 100644
--- a/runtime/Cpp/runtime/src/ParserInterpreter.cpp
+++ b/runtime/Cpp/runtime/src/ParserInterpreter.cpp
@@ -8,6 +8,9 @@
 #include <string>
 #include <cstddef>
 #include "dfa/DFA.h"
+#include "atn/ATNStateType.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/RuleStartState.h"
 #include "InterpreterRuleContext.h"
diff --git a/runtime/Cpp/runtime/src/ParserInterpreter.h b/runtime/Cpp/runtime/src/ParserInterpreter.h
index 1b5c1dd85e..ae57da7275 100644
--- a/runtime/Cpp/runtime/src/ParserInterpreter.h
+++ b/runtime/Cpp/runtime/src/ParserInterpreter.h
@@ -11,6 +11,8 @@
 #include <string>
 #include <cstddef>
 #include "Parser.h"
+#include "Token.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/ATN.h"
 #include "support/BitSet.h"
diff --git a/runtime/Cpp/runtime/src/ParserRuleContext.h b/runtime/Cpp/runtime/src/ParserRuleContext.h
index 6365abc354..9876f14637 100644
--- a/runtime/Cpp/runtime/src/ParserRuleContext.h
+++ b/runtime/Cpp/runtime/src/ParserRuleContext.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "RuleContext.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "support/CPPUtils.h"
 
diff --git a/runtime/Cpp/runtime/src/ProxyErrorListener.cpp b/runtime/Cpp/runtime/src/ProxyErrorListener.cpp
index b3aa39ad6d..f2b9b6c907 100644
--- a/runtime/Cpp/runtime/src/ProxyErrorListener.cpp
+++ b/runtime/Cpp/runtime/src/ProxyErrorListener.cpp
@@ -5,6 +5,8 @@
 
 #include <string>
 #include <cstddef>
+#include "Token.h"
+#include "ANTLRErrorListener.h"
 #include "ProxyErrorListener.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/ProxyErrorListener.h b/runtime/Cpp/runtime/src/ProxyErrorListener.h
index f1b1ae6837..195ef609bb 100644
--- a/runtime/Cpp/runtime/src/ProxyErrorListener.h
+++ b/runtime/Cpp/runtime/src/ProxyErrorListener.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "ANTLRErrorListener.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "Exceptions.h"
 
diff --git a/runtime/Cpp/runtime/src/RecognitionException.cpp b/runtime/Cpp/runtime/src/RecognitionException.cpp
index 9ce40a36b5..aae115d3d1 100644
--- a/runtime/Cpp/runtime/src/RecognitionException.cpp
+++ b/runtime/Cpp/runtime/src/RecognitionException.cpp
@@ -5,6 +5,7 @@
 
 #include <cstddef>
 #include "atn/ATN.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "Recognizer.h"
 #include "ParserRuleContext.h"
diff --git a/runtime/Cpp/runtime/src/RecognitionException.h b/runtime/Cpp/runtime/src/RecognitionException.h
index 374d3e3eaa..34c82fd9af 100644
--- a/runtime/Cpp/runtime/src/RecognitionException.h
+++ b/runtime/Cpp/runtime/src/RecognitionException.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/IntervalSet.h"
+#include "Token.h"
 #include "Exceptions.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/Recognizer.cpp b/runtime/Cpp/runtime/src/Recognizer.cpp
index 7217be95d4..4e4063dc75 100644
--- a/runtime/Cpp/runtime/src/Recognizer.cpp
+++ b/runtime/Cpp/runtime/src/Recognizer.cpp
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "ConsoleErrorListener.h"
+#include "ANTLRErrorListener.h"
+#include "atn/ATNState.h"
 #include "RecognitionException.h"
 #include "support/CPPUtils.h"
 #include "Token.h"
diff --git a/runtime/Cpp/runtime/src/Recognizer.h b/runtime/Cpp/runtime/src/Recognizer.h
index aa11fe7222..3c2d1b1c39 100644
--- a/runtime/Cpp/runtime/src/Recognizer.h
+++ b/runtime/Cpp/runtime/src/Recognizer.h
@@ -11,6 +11,8 @@
 #include <string>
 #include <cstddef>
 #include "ProxyErrorListener.h"
+#include "ANTLRErrorListener.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "support/Casts.h"
 #include "atn/SerializedATNView.h"
diff --git a/runtime/Cpp/runtime/src/RuleContext.cpp b/runtime/Cpp/runtime/src/RuleContext.cpp
index ce11670cc7..8b6658a289 100644
--- a/runtime/Cpp/runtime/src/RuleContext.cpp
+++ b/runtime/Cpp/runtime/src/RuleContext.cpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <cstddef>
 #include "tree/Trees.h"
+#include "tree/ParseTreeType.h"
 #include "antlr4-common.h"
 #include "misc/Interval.h"
 #include "Parser.h"
diff --git a/runtime/Cpp/runtime/src/RuleContext.h b/runtime/Cpp/runtime/src/RuleContext.h
index f2fcfebf43..63a684b804 100644
--- a/runtime/Cpp/runtime/src/RuleContext.h
+++ b/runtime/Cpp/runtime/src/RuleContext.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "tree/ParseTreeType.h"
+#include "misc/Interval.h"
 #include "tree/ParseTree.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/TokenSource.h b/runtime/Cpp/runtime/src/TokenSource.h
index 60b5229745..472c2767c8 100644
--- a/runtime/Cpp/runtime/src/TokenSource.h
+++ b/runtime/Cpp/runtime/src/TokenSource.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "TokenFactory.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/TokenStream.h b/runtime/Cpp/runtime/src/TokenStream.h
index 40ecfc7ee7..37b5b49192 100644
--- a/runtime/Cpp/runtime/src/TokenStream.h
+++ b/runtime/Cpp/runtime/src/TokenStream.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "IntStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/TokenStreamRewriter.h b/runtime/Cpp/runtime/src/TokenStreamRewriter.h
index 3d17add317..506e3462c8 100644
--- a/runtime/Cpp/runtime/src/TokenStreamRewriter.h
+++ b/runtime/Cpp/runtime/src/TokenStreamRewriter.h
@@ -9,6 +9,8 @@
 #include <vector>
 #include <string>
 #include <cstddef>
+#include "Token.h"
+#include "misc/Interval.h"
 #include "antlr4-common.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/UnbufferedCharStream.h b/runtime/Cpp/runtime/src/UnbufferedCharStream.h
index 85283468fd..6720355eb8 100644
--- a/runtime/Cpp/runtime/src/UnbufferedCharStream.h
+++ b/runtime/Cpp/runtime/src/UnbufferedCharStream.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/Interval.h"
 #include "CharStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/UnbufferedTokenStream.h b/runtime/Cpp/runtime/src/UnbufferedTokenStream.h
index 61088c543a..9c9d174c01 100644
--- a/runtime/Cpp/runtime/src/UnbufferedTokenStream.h
+++ b/runtime/Cpp/runtime/src/UnbufferedTokenStream.h
@@ -10,6 +10,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "TokenStream.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/ATN.cpp b/runtime/Cpp/runtime/src/atn/ATN.cpp
index 1f1f54c9f5..835a5654c8 100644
--- a/runtime/Cpp/runtime/src/atn/ATN.cpp
+++ b/runtime/Cpp/runtime/src/atn/ATN.cpp
@@ -5,6 +5,7 @@
 
 #include <cstddef>
 #include "atn/LL1Analyzer.h"
+#include "atn/ATNState.h"
 #include "Token.h"
 #include "atn/RuleTransition.h"
 #include "misc/IntervalSet.h"
diff --git a/runtime/Cpp/runtime/src/atn/ATN.h b/runtime/Cpp/runtime/src/atn/ATN.h
index 832d998aee..0a9045b62f 100644
--- a/runtime/Cpp/runtime/src/atn/ATN.h
+++ b/runtime/Cpp/runtime/src/atn/ATN.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "RuleContext.h"
+#include "misc/IntervalSet.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "internal/Synchronization.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfig.cpp b/runtime/Cpp/runtime/src/atn/ATNConfig.cpp
index 6a36afc494..5cb83f7a09 100644
--- a/runtime/Cpp/runtime/src/atn/ATNConfig.cpp
+++ b/runtime/Cpp/runtime/src/atn/ATNConfig.cpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/PredictionContext.h"
 #include "SemanticContext.h"
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfig.h b/runtime/Cpp/runtime/src/atn/ATNConfig.h
index 6032ca1530..281de4bef0 100644
--- a/runtime/Cpp/runtime/src/atn/ATNConfig.h
+++ b/runtime/Cpp/runtime/src/atn/ATNConfig.h
@@ -11,6 +11,7 @@
 #include <cassert>
 
 #include "antlr4-common.h"
+#include "atn/ATNState.h"
 #include "atn/SemanticContext.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp b/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp
index ec2b4ed23f..afb9879ca6 100644
--- a/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp
+++ b/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 #include <cstddef>
 #include "atn/PredictionContext.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/ATNConfig.h"
 #include "atn/ATNSimulator.h"
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfigSet.h b/runtime/Cpp/runtime/src/atn/ATNConfigSet.h
index 6c36ce34fc..2e4a38446c 100644
--- a/runtime/Cpp/runtime/src/atn/ATNConfigSet.h
+++ b/runtime/Cpp/runtime/src/atn/ATNConfigSet.h
@@ -11,6 +11,7 @@
 #include <cassert>
 
 #include "support/BitSet.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/PredictionContext.h"
 #include "atn/ATNConfig.h"
diff --git a/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp b/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp
index c016f482d4..e300449a58 100644
--- a/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp
+++ b/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp
@@ -5,6 +5,7 @@
 
 #include "atn/ATNDeserializationOptions.h"
 
+#include "atn/ATNStateType.h"
 #include "antlr4-common.h"
 #include "atn/ATNType.h"
 #include "atn/ATNState.h"
diff --git a/runtime/Cpp/runtime/src/atn/ActionTransition.cpp b/runtime/Cpp/runtime/src/atn/ActionTransition.cpp
index 8b49bdcf68..eb4c9d09d9 100644
--- a/runtime/Cpp/runtime/src/atn/ActionTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/ActionTransition.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/ActionTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/ActionTransition.h b/runtime/Cpp/runtime/src/atn/ActionTransition.h
index 2db9b1ecb3..ed47a4985a 100644
--- a/runtime/Cpp/runtime/src/atn/ActionTransition.h
+++ b/runtime/Cpp/runtime/src/atn/ActionTransition.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/AtomTransition.cpp b/runtime/Cpp/runtime/src/atn/AtomTransition.cpp
index 2197b68312..0f0979ae58 100644
--- a/runtime/Cpp/runtime/src/atn/AtomTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/AtomTransition.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <cstddef>
 #include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 #include "atn/AtomTransition.h"
diff --git a/runtime/Cpp/runtime/src/atn/AtomTransition.h b/runtime/Cpp/runtime/src/atn/AtomTransition.h
index c830a371ef..eacbae349a 100644
--- a/runtime/Cpp/runtime/src/atn/AtomTransition.h
+++ b/runtime/Cpp/runtime/src/atn/AtomTransition.h
@@ -8,6 +8,9 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h b/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h
old mode 100755
new mode 100644
index c5a588fbfd..e1b6c7dbc9
--- a/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h
+++ b/runtime/Cpp/runtime/src/atn/BasicBlockStartState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/BlockStartState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/BasicState.h b/runtime/Cpp/runtime/src/atn/BasicState.h
index 9a6986ab3e..79407e4e52 100644
--- a/runtime/Cpp/runtime/src/atn/BasicState.h
+++ b/runtime/Cpp/runtime/src/atn/BasicState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/BlockEndState.h b/runtime/Cpp/runtime/src/atn/BlockEndState.h
index d8676f2c4f..3c29510da4 100644
--- a/runtime/Cpp/runtime/src/atn/BlockEndState.h
+++ b/runtime/Cpp/runtime/src/atn/BlockEndState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/BlockStartState.h b/runtime/Cpp/runtime/src/atn/BlockStartState.h
index db4d876f99..f01d7573dd 100644
--- a/runtime/Cpp/runtime/src/atn/BlockStartState.h
+++ b/runtime/Cpp/runtime/src/atn/BlockStartState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/DecisionState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/DecisionState.cpp b/runtime/Cpp/runtime/src/atn/DecisionState.cpp
index f82f3aa88a..4364dd4b1d 100644
--- a/runtime/Cpp/runtime/src/atn/DecisionState.cpp
+++ b/runtime/Cpp/runtime/src/atn/DecisionState.cpp
@@ -4,6 +4,7 @@
  */
 
 #include <string>
+#include "atn/ATNState.h"
 #include "atn/DecisionState.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/DecisionState.h b/runtime/Cpp/runtime/src/atn/DecisionState.h
index 4c35c8b2bd..e43d9de514 100644
--- a/runtime/Cpp/runtime/src/atn/DecisionState.h
+++ b/runtime/Cpp/runtime/src/atn/DecisionState.h
@@ -7,6 +7,7 @@
 
 #include <string>
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp b/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp
index 7b1f8504f3..7d767d1090 100644
--- a/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/EpsilonTransition.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/EpsilonTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/EpsilonTransition.h b/runtime/Cpp/runtime/src/atn/EpsilonTransition.h
index fdcb6cd5b9..c8db57da53 100644
--- a/runtime/Cpp/runtime/src/atn/EpsilonTransition.h
+++ b/runtime/Cpp/runtime/src/atn/EpsilonTransition.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp b/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp
index 618d70405e..68b585db4f 100644
--- a/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp
+++ b/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp
@@ -6,6 +6,10 @@
 #include <vector>
 #include <cstddef>
 #include "atn/RuleStopState.h"
+#include "atn/ATNStateType.h"
+#include "atn/TransitionType.h"
+#include "Token.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/Transition.h"
 #include "atn/RuleTransition.h"
diff --git a/runtime/Cpp/runtime/src/atn/LL1Analyzer.h b/runtime/Cpp/runtime/src/atn/LL1Analyzer.h
index 76826a6e3f..a74e87b2a1 100644
--- a/runtime/Cpp/runtime/src/atn/LL1Analyzer.h
+++ b/runtime/Cpp/runtime/src/atn/LL1Analyzer.h
@@ -8,6 +8,8 @@
 #include <vector>
 #include <cstddef>
 #include "Token.h"
+#include "misc/IntervalSet.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/ATNConfig.h"
 #include "atn/PredictionContext.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp b/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp
index e63a957226..76f52f5152 100644
--- a/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp
+++ b/runtime/Cpp/runtime/src/atn/LexerATNConfig.cpp
@@ -6,6 +6,7 @@
 #include <utility>
 #include <cstddef>
 #include "misc/MurmurHash.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/DecisionState.h"
 #include "atn/PredictionContext.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerATNConfig.h b/runtime/Cpp/runtime/src/atn/LexerATNConfig.h
index 671dbc9fad..afe832eaec 100644
--- a/runtime/Cpp/runtime/src/atn/LexerATNConfig.h
+++ b/runtime/Cpp/runtime/src/atn/LexerATNConfig.h
@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/ATNState.h"
 #include "atn/ATNConfig.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp b/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp
index 98aa9d4145..f9d04e1991 100644
--- a/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp
+++ b/runtime/Cpp/runtime/src/atn/LexerATNSimulator.cpp
@@ -9,6 +9,9 @@
 #include <vector>
 #include <cstddef>
 #include "IntStream.h"
+#include "atn/ATNStateType.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/OrderedATNConfigSet.h"
 #include "Token.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h b/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h
index 0782923261..c387bc61d1 100644
--- a/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h
+++ b/runtime/Cpp/runtime/src/atn/LexerATNSimulator.h
@@ -12,6 +12,7 @@
 #include <atomic>
 
 #include "atn/ATNSimulator.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/LexerATNConfig.h"
 #include "atn/ATNConfigSet.h"
diff --git a/runtime/Cpp/runtime/src/atn/LoopEndState.h b/runtime/Cpp/runtime/src/atn/LoopEndState.h
index 2ffc142dd9..8441d29e0c 100644
--- a/runtime/Cpp/runtime/src/atn/LoopEndState.h
+++ b/runtime/Cpp/runtime/src/atn/LoopEndState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp b/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp
index 6eb5d38133..1d141a302a 100644
--- a/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/NotSetTransition.cpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <cstddef>
 #include "atn/NotSetTransition.h"
+#include "atn/TransitionType.h"
 #include "atn/ATNState.h"
 #include "misc/IntervalSet.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/NotSetTransition.h b/runtime/Cpp/runtime/src/atn/NotSetTransition.h
index 3b15e97044..f28f23bca7 100644
--- a/runtime/Cpp/runtime/src/atn/NotSetTransition.h
+++ b/runtime/Cpp/runtime/src/atn/NotSetTransition.h
@@ -8,6 +8,9 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/SetTransition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
index 52c41f0b32..cf9f80bb97 100644
--- a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
+++ b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
@@ -11,6 +11,9 @@
 #include <string>
 #include <cstddef>
 #include "dfa/DFA.h"
+#include "atn/ATNStateType.h"
+#include "atn/TransitionType.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "NoViableAltException.h"
 #include "atn/DecisionState.h"
diff --git a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h
index 88c74c7842..720b20fa8a 100644
--- a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h
+++ b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.h
@@ -11,6 +11,7 @@
 #include <string>
 #include <cstddef>
 #include "PredictionMode.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "dfa/DFAState.h"
 #include "atn/ATNSimulator.h"
diff --git a/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h b/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h
index df8cf1352c..fe5ccdebf8 100644
--- a/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h
+++ b/runtime/Cpp/runtime/src/atn/PlusBlockStartState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/BlockStartState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h b/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h
index e024a8e1b6..91c07cbfa8 100644
--- a/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h
+++ b/runtime/Cpp/runtime/src/atn/PlusLoopbackState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/DecisionState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp b/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp
index 96fa76161b..45e4e72068 100644
--- a/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.cpp
@@ -6,6 +6,8 @@
 #include <memory>
 #include <string>
 #include <cstddef>
+#include "atn/ATNState.h"
+#include "atn/TransitionType.h"
 #include "atn/PrecedencePredicateTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h b/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h
index f18cc78b30..ab72d2246e 100644
--- a/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h
+++ b/runtime/Cpp/runtime/src/atn/PrecedencePredicateTransition.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "atn/Transition.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/SemanticContext.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp b/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp
index 78c4539d28..ac936415a4 100644
--- a/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/PredicateTransition.cpp
@@ -6,6 +6,8 @@
 #include <memory>
 #include <string>
 #include <cstddef>
+#include "atn/ATNState.h"
+#include "atn/TransitionType.h"
 #include "atn/PredicateTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/PredicateTransition.h b/runtime/Cpp/runtime/src/atn/PredicateTransition.h
index 77601b06fc..1229470df7 100644
--- a/runtime/Cpp/runtime/src/atn/PredicateTransition.h
+++ b/runtime/Cpp/runtime/src/atn/PredicateTransition.h
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "atn/Transition.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/SemanticContext.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/PredictionMode.h b/runtime/Cpp/runtime/src/atn/PredictionMode.h
index 4f5c1d8d3d..cad74cddcd 100644
--- a/runtime/Cpp/runtime/src/atn/PredictionMode.h
+++ b/runtime/Cpp/runtime/src/atn/PredictionMode.h
@@ -8,6 +8,7 @@
 #include <vector>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/ATNState.h"
 #include "support/BitSet.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/RangeTransition.cpp b/runtime/Cpp/runtime/src/atn/RangeTransition.cpp
index a4f7ffb12d..6db19e3e57 100644
--- a/runtime/Cpp/runtime/src/atn/RangeTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/RangeTransition.cpp
@@ -7,6 +7,8 @@
 #include <cstddef>
 #include "misc/IntervalSet.h"
 
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/RangeTransition.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/atn/RangeTransition.h b/runtime/Cpp/runtime/src/atn/RangeTransition.h
index 514be3e60a..9a5c72b049 100644
--- a/runtime/Cpp/runtime/src/atn/RangeTransition.h
+++ b/runtime/Cpp/runtime/src/atn/RangeTransition.h
@@ -8,6 +8,9 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/RuleStartState.h b/runtime/Cpp/runtime/src/atn/RuleStartState.h
index d0df040a7a..fa615b5b4e 100644
--- a/runtime/Cpp/runtime/src/atn/RuleStartState.h
+++ b/runtime/Cpp/runtime/src/atn/RuleStartState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/RuleStopState.h b/runtime/Cpp/runtime/src/atn/RuleStopState.h
index c362d9656e..e8f8b8a7f9 100644
--- a/runtime/Cpp/runtime/src/atn/RuleStopState.h
+++ b/runtime/Cpp/runtime/src/atn/RuleStopState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/RuleTransition.cpp b/runtime/Cpp/runtime/src/atn/RuleTransition.cpp
index b2540f3870..4b010655e5 100644
--- a/runtime/Cpp/runtime/src/atn/RuleTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/RuleTransition.cpp
@@ -6,6 +6,8 @@
 #include <string>
 #include <cstddef>
 #include "atn/RuleStartState.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/RuleTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/RuleTransition.h b/runtime/Cpp/runtime/src/atn/RuleTransition.h
index 52ccdefd77..94dcbbee83 100644
--- a/runtime/Cpp/runtime/src/atn/RuleTransition.h
+++ b/runtime/Cpp/runtime/src/atn/RuleTransition.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/SetTransition.cpp b/runtime/Cpp/runtime/src/atn/SetTransition.cpp
index 6a3c00d52c..b468108bbc 100644
--- a/runtime/Cpp/runtime/src/atn/SetTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/SetTransition.cpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <cstddef>
 #include "Token.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "misc/IntervalSet.h"
 
 #include "atn/SetTransition.h"
diff --git a/runtime/Cpp/runtime/src/atn/SetTransition.h b/runtime/Cpp/runtime/src/atn/SetTransition.h
index 9731af97d1..2451a4df3d 100644
--- a/runtime/Cpp/runtime/src/atn/SetTransition.h
+++ b/runtime/Cpp/runtime/src/atn/SetTransition.h
@@ -9,6 +9,9 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/StarBlockStartState.h b/runtime/Cpp/runtime/src/atn/StarBlockStartState.h
index 433d41225c..afa8a8e3b5 100644
--- a/runtime/Cpp/runtime/src/atn/StarBlockStartState.h
+++ b/runtime/Cpp/runtime/src/atn/StarBlockStartState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/BlockStartState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h b/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h
index 5ed0f7f827..1e83bc6120 100644
--- a/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h
+++ b/runtime/Cpp/runtime/src/atn/StarLoopEntryState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/DecisionState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp b/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp
old mode 100755
new mode 100644
index 40d05e699b..e2542e96b2
--- a/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp
+++ b/runtime/Cpp/runtime/src/atn/StarLoopbackState.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "atn/StarLoopEntryState.h"
+#include "atn/ATNStateType.h"
 #include "atn/Transition.h"
 #include "support/Casts.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/StarLoopbackState.h b/runtime/Cpp/runtime/src/atn/StarLoopbackState.h
index ebcfa9eb8b..6a86575441 100644
--- a/runtime/Cpp/runtime/src/atn/StarLoopbackState.h
+++ b/runtime/Cpp/runtime/src/atn/StarLoopbackState.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
 #include "atn/ATNState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/TokensStartState.h b/runtime/Cpp/runtime/src/atn/TokensStartState.h
index b611fccaa8..ea53462469 100644
--- a/runtime/Cpp/runtime/src/atn/TokensStartState.h
+++ b/runtime/Cpp/runtime/src/atn/TokensStartState.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "atn/ATNStateType.h"
+#include "atn/ATNState.h"
 #include "atn/DecisionState.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/atn/Transition.cpp b/runtime/Cpp/runtime/src/atn/Transition.cpp
old mode 100755
new mode 100644
index da9b7fd4e5..20fa098aaa
--- a/runtime/Cpp/runtime/src/atn/Transition.cpp
+++ b/runtime/Cpp/runtime/src/atn/Transition.cpp
@@ -4,6 +4,9 @@
  */
 
 #include "Exceptions.h"
+#include "misc/IntervalSet.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "support/Arrays.h"
 
 #include "atn/Transition.h"
diff --git a/runtime/Cpp/runtime/src/atn/Transition.h b/runtime/Cpp/runtime/src/atn/Transition.h
index c0fa6eccfc..6c80656149 100644
--- a/runtime/Cpp/runtime/src/atn/Transition.h
+++ b/runtime/Cpp/runtime/src/atn/Transition.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <cstddef>
 #include "misc/IntervalSet.h"
+#include "atn/ATNState.h"
 #include "antlr4-common.h"
 #include "atn/TransitionType.h"
 
diff --git a/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp b/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp
index 31694e1b58..a2bcc0d1ba 100644
--- a/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp
+++ b/runtime/Cpp/runtime/src/atn/WildcardTransition.cpp
@@ -7,6 +7,7 @@
 #include <cstddef>
 #include "atn/ATNState.h"
 
+#include "atn/TransitionType.h"
 #include "atn/WildcardTransition.h"
 
 using namespace antlr4::atn;
diff --git a/runtime/Cpp/runtime/src/atn/WildcardTransition.h b/runtime/Cpp/runtime/src/atn/WildcardTransition.h
index 24fc926ed4..40f0828c84 100644
--- a/runtime/Cpp/runtime/src/atn/WildcardTransition.h
+++ b/runtime/Cpp/runtime/src/atn/WildcardTransition.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "atn/TransitionType.h"
+#include "atn/ATNState.h"
 #include "atn/Transition.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/misc/IntervalSet.cpp b/runtime/Cpp/runtime/src/misc/IntervalSet.cpp
index 0d0d899291..483d9ebc9c 100644
--- a/runtime/Cpp/runtime/src/misc/IntervalSet.cpp
+++ b/runtime/Cpp/runtime/src/misc/IntervalSet.cpp
@@ -8,6 +8,8 @@
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "Lexer.h"
 #include "Exceptions.h"
diff --git a/runtime/Cpp/runtime/src/tree/ErrorNode.h b/runtime/Cpp/runtime/src/tree/ErrorNode.h
index 060dac44aa..48e019b9b8 100644
--- a/runtime/Cpp/runtime/src/tree/ErrorNode.h
+++ b/runtime/Cpp/runtime/src/tree/ErrorNode.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "tree/ParseTreeType.h"
 #include "tree/TerminalNode.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h b/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h
index 58dc86529d..280a3ebe53 100644
--- a/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h
+++ b/runtime/Cpp/runtime/src/tree/ErrorNodeImpl.h
@@ -7,6 +7,8 @@
 
 #include <string>
 #include "tree/ErrorNode.h"
+#include "tree/ParseTreeType.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "tree/TerminalNodeImpl.h"
 #include "misc/Interval.h"
diff --git a/runtime/Cpp/runtime/src/tree/ParseTree.h b/runtime/Cpp/runtime/src/tree/ParseTree.h
index ee806998d9..ffb67bd1db 100644
--- a/runtime/Cpp/runtime/src/tree/ParseTree.h
+++ b/runtime/Cpp/runtime/src/tree/ParseTree.h
@@ -8,6 +8,7 @@
 #include <vector>
 #include <string>
 #include "support/Any.h"
+#include "misc/Interval.h"
 #include "antlr4-common.h"
 #include "tree/ParseTreeType.h"
 
diff --git a/runtime/Cpp/runtime/src/tree/TerminalNode.h b/runtime/Cpp/runtime/src/tree/TerminalNode.h
index c47a114b57..0cea382d6a 100644
--- a/runtime/Cpp/runtime/src/tree/TerminalNode.h
+++ b/runtime/Cpp/runtime/src/tree/TerminalNode.h
@@ -6,6 +6,8 @@
 #pragma once
 
 #include "antlr4-common.h"
+#include "tree/ParseTreeType.h"
+#include "Token.h"
 #include "tree/ParseTree.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h b/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h
index 1c48ab63f0..6e6132c63e 100644
--- a/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h
+++ b/runtime/Cpp/runtime/src/tree/TerminalNodeImpl.h
@@ -7,6 +7,9 @@
 
 #include <string>
 #include "antlr4-common.h"
+#include "tree/ParseTreeType.h"
+#include "misc/Interval.h"
+#include "Token.h"
 #include "tree/TerminalNode.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp b/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp
index fb15a5565a..1972c54b18 100644
--- a/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp
+++ b/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp
@@ -9,6 +9,7 @@
 #include <vector>
 #include <cstddef>
 #include "tree/pattern/ParseTreePattern.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "tree/pattern/ParseTreeMatch.h"
 #include "tree/TerminalNode.h"
diff --git a/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.h b/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.h
index f02b9c33ea..28e4133f9f 100644
--- a/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.h
+++ b/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.h
@@ -10,6 +10,7 @@
 #include <vector>
 #include <string>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "Exceptions.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp b/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp
index 90d94a1ca0..7ebd1b8691 100644
--- a/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp
+++ b/runtime/Cpp/runtime/src/tree/xpath/XPath.cpp
@@ -9,6 +9,8 @@
 #include <string>
 #include <cstddef>
 #include "XPathLexer.h"
+#include "ANTLRInputStream.h"
+#include "Token.h"
 #include "antlr4-common.h"
 #include "XPathLexerErrorListener.h"
 #include "XPathElement.h"
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPath.h b/runtime/Cpp/runtime/src/tree/xpath/XPath.h
index 1167c63aee..ea8f226aae 100644
--- a/runtime/Cpp/runtime/src/tree/xpath/XPath.h
+++ b/runtime/Cpp/runtime/src/tree/xpath/XPath.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <vector>
 #include <string>
+#include "Token.h"
 #include "antlr4-common.h"
 
 namespace antlr4 {
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp
index 7608b34e2e..34f03b6bed 100644
--- a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp
+++ b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp
@@ -5,6 +5,7 @@
 
 #include <string>
 #include <cstddef>
+#include "Token.h"
 #include "XPathLexerErrorListener.h"
 
 using namespace antlr4;
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h
index 5bac3d42ec..1f04e6cfb5 100644
--- a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h
+++ b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
+#include "Token.h"
 #include "BaseErrorListener.h"
 
 namespace antlr4 {