diff --git a/Antlr4.Runtime/Antlr4.Runtime.csproj b/Antlr4.Runtime/Antlr4.Runtime.csproj
index 0f2512cc2..4ca17afb7 100644
--- a/Antlr4.Runtime/Antlr4.Runtime.csproj
+++ b/Antlr4.Runtime/Antlr4.Runtime.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Sharpen\Arrays.cs" />
     <Compile Include="Sharpen\Runtime.cs" />
     <Compile Include="TokenStreamRewriter.cs" />
+    <Compile Include="TokenTypes.cs" />
     <Compile Include="Tree\AbstractParseTreeVisitor`1.cs" />
     <Compile Include="Tree\ErrorNodeImpl.cs" />
     <Compile Include="Tree\IErrorNode.cs" />
diff --git a/Antlr4.Runtime/Lexer.cs b/Antlr4.Runtime/Lexer.cs
index f479bbbf0..2ee92a45b 100644
--- a/Antlr4.Runtime/Lexer.cs
+++ b/Antlr4.Runtime/Lexer.cs
@@ -48,10 +48,6 @@ namespace Antlr4.Runtime
     {
         public const int DefaultMode = 0;
 
-        public const int More = -2;
-
-        public const int Skip = -3;
-
         public const int DefaultTokenChannel = IToken.DefaultChannel;
 
         public const int Hidden = IToken.HiddenChannel;
diff --git a/Antlr4.Runtime/TokenTypes.cs b/Antlr4.Runtime/TokenTypes.cs
new file mode 100644
index 000000000..4ee1bc2bd
--- /dev/null
+++ b/Antlr4.Runtime/TokenTypes.cs
@@ -0,0 +1,38 @@
+/*
+ * [The "BSD license"]
+ *  Copyright (c) 2013 Terence Parr
+ *  Copyright (c) 2013 Sam Harwell
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+namespace Antlr4.Runtime
+{
+    public static class TokenTypes
+    {
+        public const int More = -2;
+
+        public const int Skip = -3;
+    }
+}