diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
index 8dcc643b94..a5082f5037 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/AntlrTokenizer.java
@@ -9,7 +9,7 @@ import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
 
-import net.sourceforge.pmd.lang.AntlrTokenManager;
+import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
 import net.sourceforge.pmd.lang.ast.TokenMgrError;
 
 /**
@@ -23,7 +23,6 @@ public abstract class AntlrTokenizer implements Tokenizer {
     public void tokenize(final SourceCode sourceCode, final Tokens tokenEntries) {
 
         AntlrTokenManager tokenManager = getLexerForSource(sourceCode);
-        tokenManager.resetListeners();
 
         try {
             Token token = (Token) tokenManager.getNextToken();
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AntlrTokenManager.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/antlr/AntlrTokenManager.java
similarity index 93%
rename from pmd-core/src/main/java/net/sourceforge/pmd/lang/AntlrTokenManager.java
rename to pmd-core/src/main/java/net/sourceforge/pmd/lang/antlr/AntlrTokenManager.java
index c6724899ac..8b0e4b0712 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AntlrTokenManager.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/antlr/AntlrTokenManager.java
@@ -2,13 +2,15 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang;
+package net.sourceforge.pmd.lang.antlr;
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 
+import net.sourceforge.pmd.lang.TokenManager;
+
 /**
  * Generic token manager implementation for all Antlr lexers.
  */
@@ -25,6 +27,7 @@ public class AntlrTokenManager implements TokenManager {
     public AntlrTokenManager(final Lexer lexer, final String fileName) {
         this.lexer = lexer;
         this.fileName = fileName;
+        resetListeners();
     }
 
     @Override
@@ -41,7 +44,7 @@ public class AntlrTokenManager implements TokenManager {
         return fileName;
     }
 
-    public void resetListeners() {
+    private void resetListeners() {
         lexer.removeErrorListeners();
         lexer.addErrorListener(new ErrorHandler());
     }
diff --git a/pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java b/pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java
index cb5a11b96e..d97b1e6426 100644
--- a/pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java
+++ b/pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.cpd;
 
 import org.antlr.v4.runtime.CharStream;
 
-import net.sourceforge.pmd.lang.AntlrTokenManager;
+import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
 import net.sourceforge.pmd.lang.swift.antlr4.SwiftLexer;
 
 /**