diff --git a/relast.preprocessor b/relast.preprocessor
index 54af6737685fab0be452f446b70b9842aba89e42..2276c320492cc5a6379e0f0f3b4442b521fede31 160000
--- a/relast.preprocessor
+++ b/relast.preprocessor
@@ -1 +1 @@
-Subproject commit 54af6737685fab0be452f446b70b9842aba89e42
+Subproject commit 2276c320492cc5a6379e0f0f3b4442b521fede31
diff --git a/relast2uml.base/src/main/jastadd/scanner/Header.flex b/relast2uml.base/src/main/jastadd/scanner/Header.flex
index 267331b325fca0ec372c7f17471b895c15b990c9..7c076bf3f48634ab54a550423951225d0b940638 100644
--- a/relast2uml.base/src/main/jastadd/scanner/Header.flex
+++ b/relast2uml.base/src/main/jastadd/scanner/Header.flex
@@ -13,5 +13,8 @@ import org.jastadd.relast2uml.parser.Relast2UmlParser.Terminals;
 %yylexthrow beaver.Scanner.Exception
 %scanerror Relast2UmlScanner.ScannerError
 
+%x COMMENT
+%s DECLARATION
+
 %line
 %column