diff --git a/pmd-cpp/src/main/ant/alljavacc.xml b/pmd-cpp/src/main/ant/alljavacc.xml
index 4066ee3a6f..de7a5f0955 100644
--- a/pmd-cpp/src/main/ant/alljavacc.xml
+++ b/pmd-cpp/src/main/ant/alljavacc.xml
@@ -40,6 +40,43 @@
         <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/CharStream.java" />
         <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java" />
         <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
+
+        <replace file="${target}/net/sourceforge/pmd/lang/cpp/ast/Token.java">
+            <replacetoken>public class Token implements java.io.Serializable</replacetoken>
+            <replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.GenericToken;
+import net.sourceforge.pmd.lang.ast.RegionByLine;
+import net.sourceforge.pmd.lang.ast.RegionByLineImpl;
+
+public class Token implements GenericToken, java.io.Serializable]]></replacevalue>
+        </replace>
+
+        <!--Add implementation methods of GenericToken-->
+        <replace file="${target}/net/sourceforge/pmd/lang/cpp/ast/Token.java">
+            <replacetoken>public Token specialToken;</replacetoken>
+            <replacevalue><![CDATA[public Token specialToken;
+
+  @Override
+  public GenericToken getNext() {
+    return next;
+  }
+
+  @Override
+  public GenericToken getPreviousSpecialGenericToken() {
+    return specialToken;
+  }
+
+  @Override
+  public RegionByLine getRegionByLine() {
+    return new RegionByLineImpl(beginLine, endLine, beginColumn, endColumn);
+  }
+
+  @Override
+  public String getImage() {
+    return image;
+  }
+]]></replacevalue>
+        </replace>
+
     </target>
 	
 </project>