diff --git a/alib2cli/src/grammar/BufferedErrorListener.h b/alib2cli/src/grammar/BufferedErrorListener.h
index 9f304b63b9ea477adf0ec53b38e6a5dbb1fe4409..40a832c95199cfb242916aa5fd6e6b266ba0f7ff 100644
--- a/alib2cli/src/grammar/BufferedErrorListener.h
+++ b/alib2cli/src/grammar/BufferedErrorListener.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "antlr4-runtime.h"
+#include <antlr4-runtime.h>
 
 namespace cli::grammar {
 
diff --git a/alib2cli/src/grammar/completion/CodeCompletionCore.cpp b/alib2cli/src/grammar/completion/CodeCompletionCore.cpp
index 1da9968c86ef11d9e9382ebe2f13f87b61d1a2d2..3e646b6539d5233b0cc6359347f192928f41f868 100644
--- a/alib2cli/src/grammar/completion/CodeCompletionCore.cpp
+++ b/alib2cli/src/grammar/completion/CodeCompletionCore.cpp
@@ -26,7 +26,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "antlr4-runtime.h"
+#include <antlr4-runtime.h>
 
 #include "CodeCompletionCore.h"
 
diff --git a/alib2cli/src/grammar/completion/Scanner.h b/alib2cli/src/grammar/completion/Scanner.h
index e999afee9ed26b90be25b762dd5bca080baa5f22..3b7298b9d58e3201556ad2c504c51aa1878bf894 100644
--- a/alib2cli/src/grammar/completion/Scanner.h
+++ b/alib2cli/src/grammar/completion/Scanner.h
@@ -21,7 +21,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "antlr4-runtime.h"
+#include <antlr4-runtime.h>
 
 #pragma once
 namespace cli::grammar::completion {
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index 4b9d45cc271e9d528e024085e050d41c6e412a1f..a1379c003e6e5effd90bb2c531ffb0dd3099c23a 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -1,9 +1,9 @@
 #include <AltCliLexer.h>
 #include <AltCliParser.h>
+#include <antlr4-runtime.h>
 #include <grammar/BufferedErrorListener.h>
 #include <parser/AltVisitor.h>
 #include "Parser.h"
-#include "antlr4-runtime.h"
 
 namespace cli {
 using namespace cli::grammar::parser;
diff --git a/alib2cli/src/parser/Parser.h b/alib2cli/src/parser/Parser.h
index 76bf01148eeaf493ee4442cc323c198ab6cc811c..1a11be6240beb43d1884c63a811009266f88eec5 100644
--- a/alib2cli/src/parser/Parser.h
+++ b/alib2cli/src/parser/Parser.h
@@ -1,21 +1,9 @@
 #pragma once
 
-#include <string>
-#include "antlr4-runtime.h"
-
-#include <ast/Arg.h>
-#include <ast/Expression.h>
-#include <ast/Option.h>
-#include <ast/Statement.h>
-
-#include <ast/options/CategoryOption.h>
-#include <ast/options/TypeOption.h>
-
+#include <antlr4-runtime.h>
 #include <ast/command/CommandList.h>
-
-#include <ast/statements/StatementList.h>
-
 #include <istream>
+#include <string>
 
 namespace cli {
 
@@ -23,12 +11,7 @@ struct Parser {
     static std::unique_ptr<CommandList> parseString(const std::string& unit);
     static std::unique_ptr<CommandList> parseStream(std::istream& istream);
 
-    class ContinueException : public std::exception {
-    public:
-        const char* what() const noexcept override
-        {
-            return "Continue";
-        }
+    class ContinueException final : public std::exception {
     };
 
 private: