diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/parsing/FlexTokenRegionProviderTest.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/parsing/FlexTokenRegionProviderTest.java
index 5b26c5f4b2d..f3da20d33dc 100644
--- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/parsing/FlexTokenRegionProviderTest.java
+++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/parsing/FlexTokenRegionProviderTest.java
@@ -118,7 +118,7 @@ protected List<CommonToken> getTokens(String model) {
 		do {
 			currentToken = (CommonToken) tokenSource.nextToken();
 			tokens.add(currentToken);
-		} while(currentToken != Token.EOF_TOKEN);
+		} while (currentToken.getType() != Token.EOF);
 		return tokens;
 	}
 }
diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/AbstractSmokeTest.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/AbstractSmokeTest.java
index 854b2e5cff3..98df13019c4 100644
--- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/AbstractSmokeTest.java
+++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/AbstractSmokeTest.java
@@ -167,7 +167,7 @@ protected LazyLinkingResource createResource(final String model) throws IOExcept
 				Lexer lexer = lexerProvider.get();
 				lexer.setCharStream(new ANTLRStringStream(string));
 				Token token = lexer.nextToken();
-				while(token != Token.EOF_TOKEN) {
+				while(token.getType() != Token.EOF) {
 					tokenList.add((CommonToken) token);
 					token = lexer.nextToken();
 				}
@@ -233,7 +233,7 @@ protected LazyLinkingResource createResource(final String model) throws IOExcept
 				Lexer lexer = lexerProvider.get();
 				lexer.setCharStream(new ANTLRStringStream(string));
 				Token token = lexer.nextToken();
-				while(token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					tokenList.add((CommonToken) token);
 					token = lexer.nextToken();
 				}
diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/SmokeTest.java b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/SmokeTest.java
index 6ce3755394f..f12413cbcc6 100644
--- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/SmokeTest.java
+++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/smoke/SmokeTest.java
@@ -115,7 +115,7 @@ public Lexer get() {
 				Lexer lexer = lexerProvider.get();
 				lexer.setCharStream(new ANTLRStringStream(string));
 				Token token = lexer.nextToken();
-				while(token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					tokenList.add((CommonToken) token);
 					token = lexer.nextToken();
 				}
diff --git a/org.eclipse.xtend.core/META-INF/MANIFEST.MF b/org.eclipse.xtend.core/META-INF/MANIFEST.MF
index d31a8b79cc2..5982ed58fa8 100644
--- a/org.eclipse.xtend.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtend.core/META-INF/MANIFEST.MF
@@ -98,7 +98,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100",
  org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/parser/antlr/internal/FlexTokenSource.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/parser/antlr/internal/FlexTokenSource.java
index fd24e04e984..38b3a386aa5 100644
--- a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/parser/antlr/internal/FlexTokenSource.java
+++ b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/parser/antlr/internal/FlexTokenSource.java
@@ -39,7 +39,7 @@ public Token nextToken() {
 		try {
 			int type = flexer.advance();
 			if (type == Token.EOF) {
-				return Token.EOF_TOKEN;
+				return new CommonToken(Token.EOF);
 			}
 			int length = flexer.getTokenLength();
 			final String tokenText = flexer.getTokenText();
diff --git a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF
index 995a9eeec3d..00342ff0982 100644
--- a/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0",
  org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.xbase.ide;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.43.0";x-friends:="org.eclipse.xtend.ide",
diff --git a/org.eclipse.xtend.ide.common/src/org/eclipse/xtend/ide/common/contentassist/antlr/internal/ContentAssistTokenSource.java b/org.eclipse.xtend.ide.common/src/org/eclipse/xtend/ide/common/contentassist/antlr/internal/ContentAssistTokenSource.java
index 02dc17e518c..a27fa70130d 100644
--- a/org.eclipse.xtend.ide.common/src/org/eclipse/xtend/ide/common/contentassist/antlr/internal/ContentAssistTokenSource.java
+++ b/org.eclipse.xtend.ide.common/src/org/eclipse/xtend/ide/common/contentassist/antlr/internal/ContentAssistTokenSource.java
@@ -39,7 +39,7 @@ public Token nextToken() {
 		try {
 			int type = flexer.advance();
 			if (type == Token.EOF) {
-				return Token.EOF_TOKEN;
+				return new CommonToken(Token.EOF);
 			}
 			int length = flexer.getTokenLength();
 			CommonToken result = new CommonTokenWithoutText(type, Token.DEFAULT_CHANNEL, offset, length);
diff --git a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.xtend b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.xtend
index 1b5cf515568..8d932a021fa 100644
--- a/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.xtend
+++ b/org.eclipse.xtend.ide/src/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.xtend
@@ -32,7 +32,7 @@ class FlexerBasedTemplateBodyHighlighter extends TemplateBodyHighlighter {
 	override doProvideHighlightingFor(String body, IHighlightedPositionAcceptor acceptor) {
 		val tokenSource = createTokenSource(new StringReader(body))
 		var token = tokenSource.nextToken
-		while (token != Token.EOF_TOKEN) {
+		while (token.type !== Token.EOF) {
 			val id = token.type.id
 			val offset = token.offset
 			val length = token.length
diff --git a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.java b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.java
index 5639829ca0f..c7c589d21cf 100644
--- a/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.java
+++ b/org.eclipse.xtend.ide/xtend-gen/org/eclipse/xtend/ide/codetemplates/ui/highlighting/FlexerBasedTemplateBodyHighlighter.java
@@ -10,7 +10,6 @@
 
 import com.google.inject.Inject;
 import java.io.StringReader;
-import java.util.Objects;
 import org.antlr.runtime.Token;
 import org.eclipse.xtend.core.parser.antlr.internal.FlexTokenSource;
 import org.eclipse.xtend.core.parser.antlr.internal.FlexerFactory;
@@ -38,7 +37,7 @@ public void doProvideHighlightingFor(final String body, final IHighlightedPositi
     StringReader _stringReader = new StringReader(body);
     final FlexTokenSource tokenSource = this._flexerFactory.createTokenSource(_stringReader);
     Token token = tokenSource.nextToken();
-    while ((!Objects.equals(token, Token.EOF_TOKEN))) {
+    while ((token.getType() != Token.EOF)) {
       {
         final String id = this._abstractAntlrTokenToAttributeIdMapper.getId(token.getType());
         final int offset = TokenTool.getOffset(token);
diff --git a/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF
index db05ae4b7c9..ab7f0b7f395 100644
--- a/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0",
  org.eclipse.xtext.xtext.generator;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF
index b011c2e992c..bc7484a1cef 100644
--- a/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.ui;bundle-version="3.207.400",
  org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional,
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.ecore;bundle-version="2.43.0",
  org.eclipse.ui.ide;bundle-version="3.22.800",
  org.eclipse.xtext.builder.standalone;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
index 3f223b1d6ea..7b186b15085 100644
--- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.43.0",
  org.eclipse.compare;bundle-version="3.11.600",
  org.eclipse.xtext.xbase.testing;bundle-version="2.43.0",
  org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional,
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.testing;bundle-version="2.43.0"
 Export-Package: org.eclipse.xtext.common.types.access;version="2.43.0",
  org.eclipse.xtext.common.types.access.impl;version="2.43.0",
diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
index bcc375669db..9fdfd81b400 100644
--- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.emf.mwe2.runtime;bundle-version="2.25.0",
  org.eclipse.xtext.ecore;bundle-version="2.43.0",
  org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.hamcrest.core;bundle-version="2.2.0",
  org.eclipse.core.runtime;bundle-version="3.34.100",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
index b16f4d3eb2e..1de5c8244ed 100644
--- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Export-Package: org.eclipse.xtext.enumrules;version="2.43.0",
  org.eclipse.xtext.generator.grammarAccess.serializer;version="2.43.0",
  org.eclipse.xtext.generator.grammarAccess.services;version="2.43.0",
  org.eclipse.xtext.metamodelreferencing.tests;version="2.43.0"
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.equinox.common;bundle-version="3.20.300",
diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
index 582996f3e84..b9cc97fee73 100644
--- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
+++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
@@ -24,7 +24,7 @@ Export-Package: org.eclipse.xtext.enumrules,
  org.eclipse.xtext.generator.grammarAccess.parser.antlr.internal,
  org.eclipse.xtext.generator.grammarAccess.serializer,
  org.eclipse.xtext.generator.grammarAccess.services
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.xtext,
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java
index 91c6e196281..0bcc8f740ea 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/AntlrProposalConflictHelper.java
@@ -65,16 +65,14 @@ public boolean existsConflict(String lastCompleteText, String proposal, ContentA
 		if (!equalTokenSequence(getProposalLexer(), getCombinedLexer()))
 			return true;
 		Token lastToken = getProposalLexer().nextToken();
-		if (!lastToken.equals(Token.EOF_TOKEN))
-			return true;
-		return false;
+		return lastToken.getType() != Token.EOF;
 	}
 
 	protected boolean equalTokenSequence(TokenSource first, TokenSource second) {
 		Token token = null;
-		while (!(token = first.nextToken()).equals(Token.EOF_TOKEN)) {
+		while ((token = first.nextToken()).getType() != Token.EOF) {
 			Token otherToken = second.nextToken();
-			if (otherToken.equals(Token.EOF_TOKEN)) {
+			if (otherToken.getType() == Token.EOF) {
 				return false;
 			}
 			if (!token.getText().equals(otherToken.getText())) {
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java
index dbc92ea469a..ab939ebb927 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/ContentAssistContextFactory.java
@@ -285,10 +285,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
 		if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
 			lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
 			Token token = lexer.nextToken();
-			if (token == Token.EOF_TOKEN) { // error case - nothing could be parsed
+			if (token.getType() == Token.EOF) { // error case - nothing could be parsed
 				return;
 			}
-			while(token != Token.EOF_TOKEN) {
+			while(token.getType() != Token.EOF) {
 				if (isErrorToken(token))
 					return;
 				token = lexer.nextToken();
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadBasedTokenSource.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadBasedTokenSource.java
index c165abeb3f8..9f3a6f2385e 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadBasedTokenSource.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/LookAheadBasedTokenSource.java
@@ -10,6 +10,7 @@
 
 import java.util.Iterator;
 
+import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenSource;
 
@@ -30,7 +31,7 @@ public Token nextToken() {
 			ILookAheadTerminal lookAhead = iter.next();
 			return lookAhead.getToken();
 		}
-		return Token.EOF_TOKEN;
+		return new CommonToken(Token.EOF);
 	}
 
 	@Override
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java
index a645ce84f52..77832dcd245 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/PartialContentAssistContextFactory.java
@@ -15,6 +15,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.INode;
+import org.eclipse.xtext.parser.antlr.Lexer;
 import org.eclipse.xtext.util.Strings;
 
 /**
@@ -27,10 +28,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
 		if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
 			lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
 			Token token = lexer.nextToken();
-			if (token == Token.EOF_TOKEN) {
+			if (token.getType() == Token.EOF) {
 				return;
 			}
-			while (token != Token.EOF_TOKEN) {
+			while (token.getType() != Token.EOF) {
 				if (isErrorToken(token)) {
 					return;
 				}
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java
index 1a85a23680d..fa6ecf4ac87 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/DFA.java
@@ -40,7 +40,7 @@ protected IUnorderedGroupHelper getUnorderedGroupHelper() {
 	
 	@Override
 	protected void error(NoViableAltException nvae) {
-		if (nvae.token == Token.EOF_TOKEN) {
+		if (nvae.token.getType() == Token.EOF) {
 			int lookAheadAddOn = getRecognizer().lookAheadAddOn;
 			int lookAhead = ((XtextTokenStream)nvae.input).getCurrentLookAhead();
 			if ((lookAhead >= lookAheadAddOn && lookAheadAddOn > 0) || (lookAhead == 0 && lookAheadAddOn > 0) || lookAhead == -1)
diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java
index 9eedfe4dd42..4636c79046a 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/antlr/internal/Lexer.java
@@ -9,6 +9,7 @@
 package org.eclipse.xtext.ide.editor.contentassist.antlr.internal;
 
 import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.FailedPredicateException;
 import org.antlr.runtime.NoViableAltException;
 import org.antlr.runtime.RecognitionException;
@@ -22,7 +23,7 @@
 public abstract class Lexer extends org.antlr.runtime.Lexer {
 
 	private static final Logger logger = Logger.getLogger(Lexer.class);
-	
+
 	protected Lexer(CharStream input) {
 		super(input);
 	}
@@ -45,7 +46,7 @@ public Token nextToken() {
 			state.tokenStartLine = input.getLine();
 			state.text = null;
 			if ( input.LA(1)==CharStream.EOF ) {
-				return Token.EOF_TOKEN;
+				return new CommonToken(Token.EOF);
 			}
 			try {
 				mTokens();
diff --git a/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
index 94488e2d620..a26a126dfb3 100644
--- a/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
  org.eclipse.core.runtime;bundle-version="3.34.100",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF
index 0ec57a839e4..6c72e70b3e9 100644
--- a/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0",
  org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.ide;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.xtext.purexbase.ide;version="2.43.0";x-internal:=true,
  org.eclipse.xtext.purexbase.ide.contentassist.antlr;version="2.43.0",
diff --git a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF
index 33581638dd6..ec4c5992d76 100644
--- a/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0";visibility:=
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
  org.eclipse.ui;bundle-version="3.207.400",
  org.eclipse.xtext.builder;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.common.types.ui;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.ui;bundle-version="2.43.0",
  org.eclipse.jdt.core;bundle-version="3.44.0",
diff --git a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
index c0a07ffe6b3..f0001841345 100644
--- a/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.equinox.common;bundle-version="3.20.300",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.xtext.common.types;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/smoketest/AbstractSmokeTest.java b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/smoketest/AbstractSmokeTest.java
index 5bc0537862a..098c9b8388a 100644
--- a/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/smoketest/AbstractSmokeTest.java
+++ b/org.eclipse.xtext.testing/src/org/eclipse/xtext/testing/smoketest/AbstractSmokeTest.java
@@ -26,9 +26,9 @@
 
 /**
  * Base class for smoke tests.
- * 
+ *
  * Clients may want to use the {@link XtextSmokeTestRunner} instead.
- * 
+ *
  * @author Sebastian Zarnekow - Initial contribution and API
  * @author Sven Efftinge
  */
@@ -83,7 +83,7 @@ public void testSkipTokensInBetween() throws Exception {
 				Lexer lexer = lexerProvider.get();
 				lexer.setCharStream(new ANTLRStringStream(string));
 				Token token = lexer.nextToken();
-				while (token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					tokenList.add((CommonToken) token);
 					token = lexer.nextToken();
 				}
@@ -157,7 +157,7 @@ public void testSkipTokensInBetweenWithoutResourceSet() throws Exception {
 				Lexer lexer = lexerProvider.get();
 				lexer.setCharStream(new ANTLRStringStream(string));
 				Token token = lexer.nextToken();
-				while (token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					tokenList.add((CommonToken) token);
 					token = lexer.nextToken();
 				}
diff --git a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF
index d97df910f1f..abd0caa6022 100644
--- a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF
@@ -27,6 +27,6 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;version="2.43.0
 Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtend.lib;bundle-version="2.43.0"
 Automatic-Module-Name: org.eclipse.xtext.testlanguages.ide
diff --git a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
index a1900ebf298..b4b02bc3053 100644
--- a/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;bundle-version="2.43.0";visibili
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
  org.eclipse.ui;bundle-version="3.207.400",
  org.eclipse.xtext.builder;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0",
  org.eclipse.compare;bundle-version="3.11.600",
  org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional,
diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
index 1f40742c765..865b9398070 100644
--- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
index a06f53f42f3..fb00723e27f 100644
--- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
  org.eclipse.core.runtime;bundle-version="3.34.100",
  org.eclipse.xtend.lib;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen
index 0a1f65e25bf..68ec5564737 100644
--- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen
+++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen
@@ -499,7 +499,7 @@ Export-Package: org.eclipse.xtext,
  org.eclipse.xtext.xtextTest,
  org.eclipse.xtext.xtextTest.impl,
  org.eclipse.xtext.xtextTest.util
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.xtext,
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java
index aff9fc45d31..fa8e1e7d443 100755
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/LexerErrorTest.java
@@ -12,8 +12,8 @@
 import java.util.List;
 
 import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.Token;
 import org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalSimpleExpressionsTestLanguageLexer;
 import org.eclipse.xtext.testlanguages.parser.antlr.internal.InternalSimpleExpressionsTestLanguageParser;
 import org.junit.Assert;
@@ -26,22 +26,20 @@ public class LexerErrorTest extends Assert {
         InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
         lexer.setCharStream(new ANTLRStringStream(model));
         CommonTokenStream stream = new CommonTokenStream(lexer);
-        @SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
         assertEquals(tokens.toString(), 3, tokens.size());
         assertEquals("a", tokens.get(0).getText());
         assertEquals(" ", tokens.get(1).getText());
         assertEquals("/* incomplete comment *", tokens.get(2).getText());
         assertEquals(0, tokens.get(2).getType());
     }
-	
+
 	@Test public void testLexerError_02() throws Exception {
 		String model = "a 'incomplete string";
 		InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
 		lexer.setCharStream(new ANTLRStringStream(model));
 		CommonTokenStream stream = new CommonTokenStream(lexer);
-		@SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
         assertEquals(tokens.toString(), 3, tokens.size());
         assertEquals("a", tokens.get(0).getText());
         assertEquals(" ", tokens.get(1).getText());
@@ -54,50 +52,46 @@ public class LexerErrorTest extends Assert {
 		InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
 		lexer.setCharStream(new ANTLRStringStream(model));
 		CommonTokenStream stream = new CommonTokenStream(lexer);
-		@SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
         assertEquals(tokens.toString(), 3, tokens.size());
         assertEquals("a", tokens.get(0).getText());
         assertEquals(" ", tokens.get(1).getText());
         assertEquals("'\\ incomplete string with bad escape sequence", tokens.get(2).getText());
         assertEquals(0, tokens.get(2).getType());
 	}
-	
+
 	@Test public void testLexerError_04() throws Exception {
 		String model = "a 'incomplete string with bad escape sequence \\";
 		InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
 		lexer.setCharStream(new ANTLRStringStream(model));
 		CommonTokenStream stream = new CommonTokenStream(lexer);
-		@SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
 		assertEquals(tokens.toString(), 3, tokens.size());
 		assertEquals("a", tokens.get(0).getText());
 		assertEquals(" ", tokens.get(1).getText());
 		assertEquals("'incomplete string with bad escape sequence \\", tokens.get(2).getText());
 		assertEquals(0, tokens.get(2).getType());
 	}
-	
+
 	@Test public void testLexerError_05() throws Exception {
 		String model = "a 'incomplete string \\'";
 		InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
 		lexer.setCharStream(new ANTLRStringStream(model));
 		CommonTokenStream stream = new CommonTokenStream(lexer);
-		@SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
 		assertEquals(tokens.toString(), 3, tokens.size());
 		assertEquals("a", tokens.get(0).getText());
 		assertEquals(" ", tokens.get(1).getText());
 		assertEquals("'incomplete string \\'", tokens.get(2).getText());
 		assertEquals(0, tokens.get(2).getType());
 	}
-	
+
 	@Test public void testLexerError_06() throws Exception {
 		String model = "a '";
 		InternalSimpleExpressionsTestLanguageLexer lexer = new InternalSimpleExpressionsTestLanguageLexer();
 		lexer.setCharStream(new ANTLRStringStream(model));
 		CommonTokenStream stream = new CommonTokenStream(lexer);
-		@SuppressWarnings("unchecked")
-		List<CommonToken> tokens = stream.getTokens();
+		List<? extends Token> tokens = stream.getTokens();
 		assertEquals(tokens.toString(), 3, tokens.size());
 		assertEquals("a", tokens.get(0).getText());
 		assertEquals(" ", tokens.get(1).getText());
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java
index 7c6e779b235..3bdec57baa4 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/TokenRegionProviderTest.java
@@ -132,7 +132,7 @@ protected List<CommonToken> getTokens(String model) {
 			currentToken = (CommonToken) lexer.nextToken();
 //			System.out.println(currentToken);
 			tokens.add(currentToken);
-		} while(currentToken != Token.EOF_TOKEN);
+		} while (currentToken.getType() != Token.EOF);
 		return tokens;
 	}
 }
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java
index 11e2c2f6def..1e9cc9ec3a7 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/XtextTokenStreamTest.java
@@ -80,7 +80,7 @@ protected void doTestLookahead(int lookAhead, int tokenCount) {
 	@Override
 	public Token nextToken() {
 		if (tokenCount == 0)
-			return Token.EOF_TOKEN;
+			return new CommonToken(Token.EOF);
 		return new CommonToken(tokenCount--, "Text");
 	}
 	
diff --git a/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF
index 1eab5b37f03..e9d312e47a2 100644
--- a/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ui.codetemplates.ide/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.xtext.ui.codetemplates;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)"
 Export-Package: org.eclipse.xtext.ui.codetemplates.ide;version="2.43.0",
  org.eclipse.xtext.ui.codetemplates.ide.contentassist.antlr;version="2.43.0",
  org.eclipse.xtext.ui.codetemplates.ide.contentassist.antlr.internal;version="2.43.0",
diff --git a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF
index 47aecb30dde..612be2f861e 100644
--- a/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ui.codetemplates.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.ui.codetemplates;bundle-version="2.43.0";visib
  org.eclipse.ui.workbench.texteditor;bundle-version="3.19.400",
  org.eclipse.core.expressions;bundle-version="3.9.500",
  org.eclipse.ui.navigator;bundle-version="3.13.300",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.compare;bundle-version="3.11.600",
  org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional,
diff --git a/org.eclipse.xtext.ui.codetemplates.ui/src/org/eclipse/xtext/ui/codetemplates/ui/highlighting/TemplateBodyHighlighter.java b/org.eclipse.xtext.ui.codetemplates.ui/src/org/eclipse/xtext/ui/codetemplates/ui/highlighting/TemplateBodyHighlighter.java
index cd77ac9ea6f..fb58e830399 100644
--- a/org.eclipse.xtext.ui.codetemplates.ui/src/org/eclipse/xtext/ui/codetemplates/ui/highlighting/TemplateBodyHighlighter.java
+++ b/org.eclipse.xtext.ui.codetemplates.ui/src/org/eclipse/xtext/ui/codetemplates/ui/highlighting/TemplateBodyHighlighter.java
@@ -44,7 +44,7 @@ public void provideHighlightingFor(String body, org.eclipse.xtext.ide.editor.syn
 	protected void doProvideHighlightingFor(String body, org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor acceptor) {
 		lexer.setCharStream(new ANTLRStringStream(body));
 		Token token = lexer.nextToken();
-		while(token != Token.EOF_TOKEN) {
+		while(token.getType() != Token.EOF) {
 			String id = tokenIdMapper.getId(token.getType());
 			int offset = TokenTool.getOffset(token);
 			int length = TokenTool.getLength(token);
diff --git a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF
index cf5a3c9fc61..e67111b6dc6 100644
--- a/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ui.codetemplates/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.eclipse.xtend.lib;bundle-version="2.43.0"
 Import-Package: org.apache.commons.logging,
diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF
index 154e5c3eea8..afe8b4e56ad 100644
--- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.43.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
  org.eclipse.xtext.ui.ecore;bundle-version="2.43.0",
  org.eclipse.xtext.testlanguages.ui;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.junit;bundle-version="4.13.2";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.9.500",
  org.eclipse.xtext.ui.testing;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen
index cbd5117f830..fca4d9ebabe 100644
--- a/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen
+++ b/org.eclipse.xtext.ui.tests/META-INF/MANIFEST.MF_gen
@@ -218,7 +218,7 @@ Export-Package: org.eclipse.xtext.ui.tests,
  org.eclipse.xtext.ui.tests.xmleditor.simplexml.util,
  org.eclipse.xtext.ui.tests.xmleditor.tests;x-internal=true,
  org.eclipse.xtext.ui.tests.xmleditor.validation
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.xtext,
diff --git a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/editor/model/IXtextDocumentAdapterTest.java b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/editor/model/IXtextDocumentAdapterTest.java
index 17d9bc75bb8..56aac568df5 100644
--- a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/editor/model/IXtextDocumentAdapterTest.java
+++ b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/editor/model/IXtextDocumentAdapterTest.java
@@ -18,6 +18,7 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 
+import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenSource;
 import org.eclipse.core.resources.IFile;
@@ -54,7 +55,7 @@ protected TokenSource createTokenSource(String string) {
 			return new org.antlr.runtime.TokenSource() {
 				@Override
 				public Token nextToken() {
-					return Token.EOF_TOKEN;
+					return new CommonToken(Token.EOF);
 				}
 
 				@Override
diff --git a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/xmleditor/AbstractLexerTest.java b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/xmleditor/AbstractLexerTest.java
index 0b3536f38eb..3b795ddb5ea 100644
--- a/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/xmleditor/AbstractLexerTest.java
+++ b/org.eclipse.xtext.ui.tests/tests/org/eclipse/xtext/ui/tests/xmleditor/AbstractLexerTest.java
@@ -3,7 +3,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.xtext.ui.tests.xmleditor;
@@ -52,7 +52,7 @@ private String lexerResult(Lexer lexer, Map<Integer, String> tokenNames, CharSeq
 		List<String> result = new ArrayList<>();
 		while (true) {
 			Token token = lexer.nextToken();
-			if (token == Token.EOF_TOKEN) {
+			if (token.getType() == Token.EOF) {
 				return Joiner.on(System.lineSeparator()).join(result);
 			}
 			Object nameOrType = null;
diff --git a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/AntlrProposalConflictHelper.java b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/AntlrProposalConflictHelper.java
index 1bb716a8fb5..ffce0da6496 100644
--- a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/AntlrProposalConflictHelper.java
+++ b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/AntlrProposalConflictHelper.java
@@ -25,7 +25,7 @@
  * with the input in the document.</p>
  * <p>A proposal is considered to be conflicting if the lexer would not produce
  * two distinct tokens for the previous sibling and the proposal itself but consume
- * parts of the proposal as part of the first token. 
+ * parts of the proposal as part of the first token.
  * Example:</p>
  * <code>
  * === Grammar:<br/>
@@ -36,8 +36,8 @@
  * <p>where <code>|</code> denotes the cursor position. A valid follow
  * token for the parser is the ID of the cross reference. However, since
  * <code>MyIdSomethingElse</code> would be consumed as a single ID by the lexer,
- * the proposal <code>SomethingElse</code> is invalid.</p> 
- * 
+ * the proposal <code>SomethingElse</code> is invalid.</p>
+ *
  * @author Sebastian Zarnekow - Initial contribution and API
  */
 public class AntlrProposalConflictHelper extends ProposalConflictHelper {
@@ -49,7 +49,7 @@ public class AntlrProposalConflictHelper extends ProposalConflictHelper {
 	@Inject
 	@Named(LexerBindings.RUNTIME)
 	private Lexer lastCompleteLexer;
-	
+
 	@Inject
 	@Named(LexerBindings.RUNTIME)
 	private Lexer combinedLexer;
@@ -62,16 +62,14 @@ public boolean existsConflict(String lastCompleteText, String proposal, ContentA
 		if (!equalTokenSequence(getProposalLexer(), getCombinedLexer()))
 			return true;
 		Token lastToken = getProposalLexer().nextToken();
-		if (!lastToken.equals(Token.EOF_TOKEN))
-			return true;
-		return false;
+		return lastToken.getType() != Token.EOF;
 	}
 
 	protected boolean equalTokenSequence(TokenSource first, TokenSource second) {
 		Token token = null;
-		while(!(token = first.nextToken()).equals(Token.EOF_TOKEN)) {
+		while ((token = first.nextToken()).getType() != Token.EOF) {
 			Token otherToken = second.nextToken();
-			if (otherToken.equals(Token.EOF_TOKEN)) {
+			if (otherToken.getType() == Token.EOF) {
 				return false;
 			}
 			if (!token.getText().equals(otherToken.getText())) {
@@ -80,7 +78,7 @@ protected boolean equalTokenSequence(TokenSource first, TokenSource second) {
 		}
 		return true;
 	}
-	
+
 	protected void initTokenSources(String lastCompleteText, String proposal, ContentAssistContext context) {
 		String combinedText = lastCompleteText.concat(proposal);
 		initTokenSource(combinedText, getCombinedLexer(), context);
diff --git a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/ParserBasedContentAssistContextFactory.java b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/ParserBasedContentAssistContextFactory.java
index f8b6ebdd597..d80fe485610 100644
--- a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/ParserBasedContentAssistContextFactory.java
+++ b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/ParserBasedContentAssistContextFactory.java
@@ -401,10 +401,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
 			if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
 				lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
 				Token token = lexer.nextToken();
-				if (token == Token.EOF_TOKEN) { // error case - nothing could be parsed
+				if (token.getType() == Token.EOF) { // error case - nothing could be parsed
 					return;
 				}
-				while(token != Token.EOF_TOKEN) {
+				while(token.getType() != Token.EOF) {
 					if (isErrorToken(token))
 						return;
 					token = lexer.nextToken();
@@ -773,10 +773,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
 			if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
 				lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
 				Token token = lexer.nextToken();
-				if (token == Token.EOF_TOKEN) {
+				if (token.getType() == Token.EOF) {
 					return;
 				}
-				while (token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					if (isErrorToken(token)) {
 						return;
 					}
diff --git a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/internal/Lexer.java b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/internal/Lexer.java
index 4d5ce3fbd2b..3df1e915e77 100644
--- a/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/internal/Lexer.java
+++ b/org.eclipse.xtext.ui/deprecated/org/eclipse/xtext/ui/editor/contentassist/antlr/internal/Lexer.java
@@ -9,6 +9,7 @@
 package org.eclipse.xtext.ui.editor.contentassist.antlr.internal;
 
 import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonToken;
 import org.antlr.runtime.FailedPredicateException;
 import org.antlr.runtime.NoViableAltException;
 import org.antlr.runtime.RecognitionException;
@@ -45,7 +46,7 @@ public Token nextToken() {
 			state.tokenStartLine = input.getLine();
 			state.text = null;
 			if ( input.LA(1)==CharStream.EOF ) {
-				return Token.EOF_TOKEN;
+				return new CommonToken(Token.EOF);
 			}
 			try {
 				mTokens();
diff --git a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/BacktrackingLexerDocumentTokenSource.java b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/BacktrackingLexerDocumentTokenSource.java
index 051eb5bc29b..fffdb87716e 100644
--- a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/BacktrackingLexerDocumentTokenSource.java
+++ b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/BacktrackingLexerDocumentTokenSource.java
@@ -12,11 +12,12 @@
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenSource;
 import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.xtext.parser.antlr.Lexer;
 
 /**
  * The old version of the {@link DocumentTokenSource}. It assumes that all tokens before the damaged region can change
- * with a {@link DocumentEvent} therefore the entire document is being lexed. 
- * 
+ * with a {@link DocumentEvent} therefore the entire document is being lexed.
+ *
  * @author koehnlein - Initial contribution and API
  * @since 2.4
  */
@@ -33,7 +34,7 @@ protected RepairEntryData getRepairEntryData(DocumentEvent e) throws Exception {
 		CommonToken token = (CommonToken) source.nextToken();
 		// find start idx
 		while (true) {
-			if (token == Token.EOF_TOKEN) {
+			if (token.getType() == Token.EOF) {
 				break;
 			}
 			if (tokenInfoIdx >= getInternalModifyableTokenInfos().size())
diff --git a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/DocumentTokenSource.java b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/DocumentTokenSource.java
index 29ed315cd4f..60175771c96 100644
--- a/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/DocumentTokenSource.java
+++ b/org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/editor/model/DocumentTokenSource.java
@@ -229,7 +229,7 @@ protected List<TokenInfo> createTokenInfos(String string) {
 		List<TokenInfo> result = Lists.newArrayListWithExpectedSize(string.length() / 3);
 		TokenSource source = createTokenSource(string);
 		CommonToken token = (CommonToken) source.nextToken();
-		while (token != Token.EOF_TOKEN) {
+		while (token.getType() != Token.EOF) {
 			TokenInfo info = createTokenInfo(token);
 			result.add(info);
 			token = (CommonToken) source.nextToken();
@@ -281,7 +281,7 @@ protected IRegion computeDamageRegion(final DocumentEvent e) {
 			int tokenStartsAt = repairEntryData.offset;
 			int tokenInfoIdx = repairEntryData.index;
 			CommonToken token = repairEntryData.newToken;
-			if (token == Token.EOF_TOKEN) 
+			if (token.getType() == Token.EOF)
 				internalModifyableTokenInfos.subList(tokenInfoIdx, internalModifyableTokenInfos.size()).clear();
 			int regionOffset = tokenStartsAt;
 			int regionLength = e.fDocument.getLength()- tokenStartsAt;
@@ -289,7 +289,7 @@ protected IRegion computeDamageRegion(final DocumentEvent e) {
 			int lengthDiff = e.fText.length() - e.fLength;
 			// compute region length
 			while (true) {
-				if (token == Token.EOF_TOKEN || tokenInfoIdx >= internalModifyableTokenInfos.size())
+				if (token.getType() == Token.EOF || tokenInfoIdx >= internalModifyableTokenInfos.size())
 					break;
 				while (true) {
 					if (tokenInfoIdx >= internalModifyableTokenInfos.size())
@@ -314,7 +314,7 @@ protected IRegion computeDamageRegion(final DocumentEvent e) {
 			internalModifyableTokenInfos.subList(tokenInfoIdx, internalModifyableTokenInfos.size()).clear();
 			// add subsequent tokens
 			if (tokenInfoIdx >= internalModifyableTokenInfos.size()) {
-				while (token != Token.EOF_TOKEN) {
+				while (token.getType() != Token.EOF) {
 					internalModifyableTokenInfos.add(createTokenInfo(token));
 					token = (CommonToken) repairEntryData.tokenSource.nextToken();
 				}
diff --git a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF
index 5439dad76b7..caed251a649 100644
--- a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.objectweb.asm;bundle-version="[9.9.1,10.0.0)",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.lsp4j;bundle-version="[1.0.0,1.1.0)";resolution:=optional
 Export-Package: org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr;version="2.43.0";x-friends:="org.eclipse.xtext.xbase.ui",
  org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.internal;version="2.43.0";x-friends:="org.eclipse.xtext.xbase.ui",
diff --git a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF
index b038bd75aa5..7f54380161e 100644
--- a/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.testdata/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.objectweb.asm;bundle-version="[9.9.1,10.0.0)",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)"
 Automatic-Module-Name: org.eclipse.xtext.xbase.testdata
 Export-Package: .;version="2.43.0",
  bar;version="2.43.0",
diff --git a/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF
index 8facee493ee..6a7a11f7fa5 100644
--- a/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.testlanguages.ide/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0",
  org.eclipse.xtext.ide;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.ide;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.xtext.xbase.testlanguages.bug462047.ide;version="2.43.0",
  org.eclipse.xtext.xbase.testlanguages.bug462047.ide.contentassist.antlr;version="2.43.0",
diff --git a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF
index 7f9db4352f5..b9ae73e6471 100644
--- a/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.testlanguages.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0";vi
  org.eclipse.xtext.xbase.ui;bundle-version="2.43.0",
  org.eclipse.ui;bundle-version="3.207.400",
  org.eclipse.xtext.builder;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.common.types.ui;bundle-version="2.43.0",
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0",
  org.eclipse.compare;bundle-version="3.11.600",
diff --git a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
index 404687c0182..ad376926fe6 100644
--- a/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.testlanguages/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.43.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.common.types;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional,
diff --git a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF
index 42dd30a6ae8..7bc046dbb1c 100644
--- a/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reex
  org.eclipse.xtext.builder;bundle-version="2.43.0",
  org.eclipse.xtext.common.types.ui;bundle-version="2.43.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.ui;bundle-version="3.36.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.jdt.core.manipulation;bundle-version="1.23.200";resolution:=optional;x-installation:=greedy,
diff --git a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
index ebda0100ee5..1df218b223f 100644
--- a/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xbase/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
  org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
  org.eclipse.xtend.lib;bundle-version="2.43.0";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional
diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
index a59828420ba..134ac89ea9b 100644
--- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0";x-installation:=greedy
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.emf.mwe2.lib;bundle-version="2.25.0";resolution:=optional,
  org.eclipse.equinox.common;bundle-version="3.20.300",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
  org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional,
  com.google.gson;bundle-version="2.10.1";resolution:=optional
diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend
index b6f76a0832e..207f26f4694 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.xtend
@@ -505,7 +505,7 @@ class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment2 {
 					grammar.parserClass.packageName,
 					grammar.internalParserClass.packageName
 				]
-				requiredBundles += "org.antlr.runtime;bundle-version=\"[3.2.0,3.2.1)\""
+				requiredBundles += "org.antlr.runtime;bundle-version=\"[3.5.3,4.5.4)\""
 			]
 		}
 		val rtBindings = new GuiceModuleAccess.BindingFactory()
@@ -542,7 +542,7 @@ class XtextAntlrGeneratorFragment2 extends AbstractAntlrGeneratorFragment2 {
 					grammar.parserClass.packageName,
 					grammar.internalParserClass.packageName
 				]
-				requiredBundles += "org.antlr.runtime;bundle-version=\"[3.2.0,3.2.1)\""
+				requiredBundles += "org.antlr.runtime;bundle-version=\"[3.5.3,4.5.4)\""
 			]
 		}
 		val ideBindings = new GuiceModuleAccess.BindingFactory()
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java
index 8533ac82a9f..2c42220391f 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/XtextAntlrGeneratorFragment2.java
@@ -1253,7 +1253,7 @@ protected void addRuntimeBindingsAndImports() {
         String _packageName_2 = naming.getInternalParserClass(this.getGrammar()).getPackageName();
         Iterables.<String>addAll(_exportedPackages, Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList(_packageName, _packageName_1, _packageName_2)));
         Set<String> _requiredBundles = it.getRequiredBundles();
-        _requiredBundles.add("org.antlr.runtime;bundle-version=\"[3.2.0,3.2.1)\"");
+        _requiredBundles.add("org.antlr.runtime;bundle-version=\"[3.5.3,4.5.4)\"");
       };
       ObjectExtensions.<ManifestAccess>operator_doubleArrow(_manifest_1, _function);
     }
@@ -1318,7 +1318,7 @@ protected void addIdeBindingsAndImports() {
         String _packageName_2 = naming.getInternalParserClass(this.getGrammar()).getPackageName();
         Iterables.<String>addAll(_exportedPackages, Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList(_packageName, _packageName_1, _packageName_2)));
         Set<String> _requiredBundles = it.getRequiredBundles();
-        _requiredBundles.add("org.antlr.runtime;bundle-version=\"[3.2.0,3.2.1)\"");
+        _requiredBundles.add("org.antlr.runtime;bundle-version=\"[3.5.3,4.5.4)\"");
       };
       ObjectExtensions.<ManifestAccess>operator_doubleArrow(_manifest_1, _function);
     }
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF
index fd84398fed4..59b22171135 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics.ide/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.arithmetics.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.example.arithmetics,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF
index 5fc40a7a403..02020413f9c 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/arithmetics/org.eclipse.xtext.example.arithmetics/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.arithmetics; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.equinox.common;bundle-version="3.19.0",
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF
index 3a82007af49..e90aa21f67a 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.ide/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.example.domainmodel,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
index 65edb9af29f..ad5f23c80da 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.domainmodel; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.equinox.common;bundle-version="3.19.0",
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF
index dc7786f926c..4d49ed615d1 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ide/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.example.fowlerdsl,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.lib
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
index b567df60474..15cc52b246c 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.compare;bundle-version="3.8.300",
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
index edda3b5b82a..2e5920b3c01 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/fowlerdsl/org.eclipse.xtext.example.fowlerdsl/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.fowlerdsl; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.equinox.common;bundle-version="3.19.0",
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF
index 81c9ac4836a..00173c3cb0a 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation.ide/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.homeautomation.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.xtext.example.homeautomation,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
index 83f1f6de4af..6540e5009ad 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.43.0.qualifier
 Bundle-SymbolicName: org.eclipse.xtext.example.homeautomation; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
  org.eclipse.equinox.common;bundle-version="3.19.0",
diff --git a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF
index 00b20ace0bb..c3315bdf8c2 100644
--- a/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
  org.eclipse.ui.ide;bundle-version="3.22.800",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.jdt.core;bundle-version="3.44.0",
  org.eclipse.jdt.ui;bundle-version="3.36.0",
  org.eclipse.xtext.testing;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
index 383163afd67..b4686cea3d7 100644
--- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.43.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.pde.ui;bundle-version="3.16.300";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.builder;bundle-version="2.43.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
  org.eclipse.compare;bundle-version="3.11.600",
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
index d1d02b6ff5d..fc35e6770f6 100644
--- a/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -205,7 +205,7 @@ Export-Package: org.eclipse.xtext;version="2.43.0",
 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.37.0";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport,
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
+ org.antlr.runtime;bundle-version="[3.5.3,4.5.4)";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.9.1,10.0.0)";resolution:=optional,
  org.eclipse.emf.mwe.core;bundle-version="1.19.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.mwe.utils;bundle-version="1.19.0";resolution:=optional;visibility:=reexport,
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java
index f235d497b0b..511c921e361 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/Lexer.java
@@ -57,7 +57,7 @@ public Token nextToken() {
 			this.state.tokenStartLine = input.getLine();
 			this.state.text = null;
 			if (input.LA(1) == CharStream.EOF) {
-				return Token.EOF_TOKEN;
+				return new CommonToken(Token.EOF);
 			}
 			try {
 				mTokens();
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java
index 5cfe6841af4..f983aeb8e13 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/XtextTokenStream.java
@@ -82,40 +82,43 @@ public String toString(int start, int stop) {
 			return null;
 		}
 		if ( p == -1 ) {
-			fillBuffer();
+			fill();
 		}
 		if ( stop>=tokens.size() ) {
 			stop = tokens.size()-1;
 		}
-		if (tokenSource instanceof Lexer) {
-			Token startToken = (Token) tokens.get(start);
-			Token stopToken = (Token) tokens.get(stop);
-			if (startToken instanceof CommonToken && stopToken instanceof CommonToken) {
-				CommonToken commonStart = (CommonToken) startToken;
-				CommonToken commonStop = (CommonToken) stopToken;
-				CharStream charStream = ((Lexer) tokenSource).getCharStream();
+		if (tokenSource instanceof Lexer lexer) {
+			Token startToken = tokens.get(start);
+			Token stopToken = tokens.get(stop);
+			if (stopToken.getType() == Token.EOF && stop > 0) {
+				stopToken = tokens.get(stop - 1);
+			}
+			if (startToken instanceof CommonToken commonStart && stopToken instanceof CommonToken commonStop) {
+				CharStream charStream = lexer.getCharStream();
 				String result = charStream.substring(commonStart.getStartIndex(), commonStop.getStopIndex());
 				return result;
 			}
 		}
 		// fall back to super implementation but use StringBuilder instead of StringBuffer
 		// and use reasonable initialization size
- 		StringBuilder result = new StringBuilder(Math.max(1024, tokens.size() * 6));
-		for (int i = start; i <= stop; i++) {
-			Token t = (Token)tokens.get(i);
+		StringBuilder result = new StringBuilder(Math.max(1024, tokens.size() * 6));
+		for (Token t : tokens.subList(start, stop + 1)) {
+			if (t.getType() == Token.EOF) {
+				break;
+			}
 			result.append(t.getText());
 		}
 		return result.toString();
 	}
 	
 	@SuppressWarnings({ "serial" })
-	private final class TokenList extends ArrayList<Object> {
+	private final class TokenList extends ArrayList<Token> {
 		private TokenList(int initialCapacity) {
 			super(initialCapacity);
 		}
 
 		@Override
-		public Object get(int index) {
+		public Token get(int index) {
 			Token tok = (Token) super.get(index);
 			// adjust only tokens in the 'future', as we wont change the channel of previously parsed
 			// tokens
@@ -208,7 +211,7 @@ public int LA(int i) {
 	 * @since 2.22
 	 */
 	protected int getTokenIndex(Token tok) {
-		if (tok == Token.EOF_TOKEN) {
+		if (tok.getType() == Token.EOF) {
 			return size();
 		}
 		return tok.getTokenIndex();
@@ -291,7 +294,7 @@ public Token LT(int k) {
         	// copied from super.LT(k) except from the last assignment to p
         	int k_ = k + 1;
         	if ( (p+k_-1) >= tokens.size() ) {
-    			return Token.EOF_TOKEN;
+    			return new CommonToken(Token.EOF);
     		}
     		int i = p;
     		int n = 1;
@@ -305,7 +308,7 @@ public Token LT(int k) {
     			n++;
     		}
     		if ( i>=tokens.size() ) {
-    			return Token.EOF_TOKEN;
+    			return new CommonToken(Token.EOF);
     		}
     		p = i; // adjust p to the valid pointer
             result = (Token)tokens.get(i);
diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java
index 648350d2863..b41711a540f 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/parser/impl/TokenRegionProvider.java
@@ -41,13 +41,13 @@ public ITextRegion getTokenRegion(String text, ITextRegion region) {
 		CommonToken nextToken = (CommonToken) lexer.nextToken();
 		int regionStart = region.getOffset();
 		int regionEnd = region.getEndOffset();
-		while (nextToken != Token.EOF_TOKEN && currentEnd <= regionStart) {
+		while (nextToken.getType() != Token.EOF && currentEnd <= regionStart) {
 			currentStart = nextToken.getStartIndex();
 			currentEnd = nextToken.getStopIndex() + 1;
 			nextToken = (CommonToken) lexer.nextToken();
 		}
 		// nextToken is either EOF or the first token that follows the start of the given region
-		while (nextToken != Token.EOF_TOKEN && currentEnd < regionEnd) {
+		while (nextToken.getType() != Token.EOF && currentEnd < regionEnd) {
 			currentEnd = nextToken.getStopIndex() + 1;
 			nextToken = (CommonToken) lexer.nextToken();
 		}