diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index ee4734b1c453826b88aac9b97424f75b0ae4249a..4d9268d9b8cf57de32bf103493b432f05bef8745 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -1,4 +1,6 @@
 #include <libwccl/parser/Parser.h>
+#include "ANTLRLexer.hpp"
+#include "ANTLRParser.hpp"
 
 /**
  * @desc Parser constructor. Default tagset is NULL
diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h
index 1cbb11cfa8bbfc25dcb2c2edf8021e9ec93b038b..10709d4dfdad9666f6daf4978867e6b89405e73a 100644
--- a/libwccl/parser/Parser.h
+++ b/libwccl/parser/Parser.h
@@ -1,9 +1,6 @@
 #ifndef LIBWCCL_PARSER_PARSER_H
 #define LIBWCCL_PARSER_PARSER_H
 
-#include "ANTLRLexer.hpp"
-#include "ANTLRParser.hpp"
-
 #include <iostream>
 
 // ----------------------------------------------------------------------------
diff --git a/wcclparser/bool_main.cpp b/wcclparser/bool_main.cpp
index 68214133e9292687d22b612eb448cc52f5a40e8d..b8a6dce720e261511d1743d29449f564c12c9480 100644
--- a/wcclparser/bool_main.cpp
+++ b/wcclparser/bool_main.cpp
@@ -2,6 +2,7 @@
 
 #include <libwccl/values/strset.h>
 #include <libwccl/parser/Parser.h>
+#include <antlr/MismatchedTokenException.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/wcclparser/strop_main.cpp b/wcclparser/strop_main.cpp
index 255e81d7639ef11e0b96ac2eda5353b107470bfd..6475d2492b83eff741c32dbc09e178094348f261 100644
--- a/wcclparser/strop_main.cpp
+++ b/wcclparser/strop_main.cpp
@@ -4,6 +4,7 @@
 #include <libwccl/values/strset.h>
 #include <libwccl/parser/Parser.h>
 #include <libwccl/parser/ANTLRParserResult.h>
+#include <antlr/MismatchedTokenException.hpp>
 
 // ----------------------------------------------------------------------------
 
diff --git a/wcclparser/tagset_main.cpp b/wcclparser/tagset_main.cpp
index 1dd25c63b9b17485a80aabe6f11144f2a3ee0b2c..fc8efabd53a78890f826c4841c8d82f73c490c7c 100644
--- a/wcclparser/tagset_main.cpp
+++ b/wcclparser/tagset_main.cpp
@@ -4,6 +4,7 @@
 
 #include <libwccl/parser/Parser.h>
 #include <libwccl/parser/ANTLRParserResult.h>
+#include <antlr/MismatchedTokenException.hpp>
 
 // ----------------------------------------------------------------------------