diff --git a/include/plasp/pddl/expressions/Binary.h b/include/plasp/pddl/expressions/Binary.h
index 32b2c73..ed57a8a 100644
--- a/include/plasp/pddl/expressions/Binary.h
+++ b/include/plasp/pddl/expressions/Binary.h
@@ -1,10 +1,8 @@
 #ifndef __PLASP__PDDL__EXPRESSIONS__BINARY_H
 #define __PLASP__PDDL__EXPRESSIONS__BINARY_H
 
-#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/Context.h>
 #include <plasp/pddl/Expression.h>
-#include <plasp/pddl/expressions/Variable.h>
 
 namespace plasp
 {
diff --git a/include/plasp/pddl/expressions/NAry.h b/include/plasp/pddl/expressions/NAry.h
index 5529577..a23cd78 100644
--- a/include/plasp/pddl/expressions/NAry.h
+++ b/include/plasp/pddl/expressions/NAry.h
@@ -1,10 +1,8 @@
 #ifndef __PLASP__PDDL__EXPRESSIONS__N_ARY_H
 #define __PLASP__PDDL__EXPRESSIONS__N_ARY_H
 
-#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/Context.h>
 #include <plasp/pddl/Expression.h>
-#include <plasp/pddl/expressions/Variable.h>
 
 namespace plasp
 {
diff --git a/include/plasp/pddl/expressions/PrimitiveType.h b/include/plasp/pddl/expressions/PrimitiveType.h
index a471d00..394bb87 100644
--- a/include/plasp/pddl/expressions/PrimitiveType.h
+++ b/include/plasp/pddl/expressions/PrimitiveType.h
@@ -1,7 +1,6 @@
 #ifndef __PLASP__PDDL__EXPRESSIONS__PRIMITIVE_TYPE_H
 #define __PLASP__PDDL__EXPRESSIONS__PRIMITIVE_TYPE_H
 
-#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/Expression.h>
 #include <plasp/utils/ParserException.h>
 
diff --git a/src/plasp/pddl/Description.cpp b/src/plasp/pddl/Description.cpp
index 83672ae..f497a4e 100644
--- a/src/plasp/pddl/Description.cpp
+++ b/src/plasp/pddl/Description.cpp
@@ -5,6 +5,7 @@
 
 #include <boost/filesystem.hpp>
 
+#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/IO.h>
 #include <plasp/utils/ParserException.h>
 
diff --git a/src/plasp/pddl/Problem.cpp b/src/plasp/pddl/Problem.cpp
index 312cef3..5673b22 100644
--- a/src/plasp/pddl/Problem.cpp
+++ b/src/plasp/pddl/Problem.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 
+#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/Domain.h>
 #include <plasp/pddl/ExpressionContext.h>
 #include <plasp/pddl/IO.h>
diff --git a/tests/TestPDDLParser.cpp b/tests/TestPDDLParser.cpp
index 8ef2721..96b8e07 100644
--- a/tests/TestPDDLParser.cpp
+++ b/tests/TestPDDLParser.cpp
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <stdexcept>
 
+#include <plasp/pddl/ConsistencyException.h>
 #include <plasp/pddl/Description.h>
 #include <plasp/pddl/expressions/And.h>
 #include <plasp/pddl/expressions/Either.h>