diff --git a/src/language/modules/BinaryOperatorRegisterForVh.cpp b/src/language/modules/BinaryOperatorRegisterForVh.cpp
index 098228f1310d8d056a9d4fbf533ce5f9b0405153..3eb83537323d91bbf6266cbefebf4d004d74c2be 100644
--- a/src/language/modules/BinaryOperatorRegisterForVh.cpp
+++ b/src/language/modules/BinaryOperatorRegisterForVh.cpp
@@ -6,7 +6,6 @@
 #include <language/utils/DataVariant.hpp>
 #include <language/utils/EmbeddedDiscreteFunctionOperators.hpp>
 #include <language/utils/OperatorRepository.hpp>
-#include <scheme/IDiscreteFunction.hpp>
 
 void
 BinaryOperatorRegisterForVh::_register_plus()
diff --git a/src/language/modules/MathFunctionRegisterForVh.cpp b/src/language/modules/MathFunctionRegisterForVh.cpp
index aa309ca19389414dbc8c843f68475da9ec918f61..122f9d20d1eb21c34bbb57764789880ec632583d 100644
--- a/src/language/modules/MathFunctionRegisterForVh.cpp
+++ b/src/language/modules/MathFunctionRegisterForVh.cpp
@@ -4,7 +4,6 @@
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
 #include <language/utils/EmbeddedDiscreteFunctionMathFunctions.hpp>
 #include <scheme/DiscreteFunctionVariant.hpp>
-#include <scheme/IDiscreteFunctionDescriptor.hpp>
 
 MathFunctionRegisterForVh::MathFunctionRegisterForVh(SchemeModule& scheme_module)
 {
diff --git a/src/language/modules/UnaryOperatorRegisterForVh.cpp b/src/language/modules/UnaryOperatorRegisterForVh.cpp
index 417cc32f5e6dd9ff14f5709268a41ce068e071b9..e2e9c2db9b72a9a687806d24dee836cfd37a22e8 100644
--- a/src/language/modules/UnaryOperatorRegisterForVh.cpp
+++ b/src/language/modules/UnaryOperatorRegisterForVh.cpp
@@ -6,7 +6,6 @@
 #include <language/utils/EmbeddedDiscreteFunctionOperators.hpp>
 #include <language/utils/OperatorRepository.hpp>
 #include <language/utils/UnaryOperatorProcessorBuilder.hpp>
-#include <scheme/IDiscreteFunction.hpp>
 
 void
 UnaryOperatorRegisterForVh::_register_unary_minus()
diff --git a/src/language/utils/EmbeddedDiscreteFunctionMathFunctions.cpp b/src/language/utils/EmbeddedDiscreteFunctionMathFunctions.cpp
index f71b3bec237eccbc96b1726cdb5c8db538cb4571..3d820c561f623d01967c6a4d947eaa91a531e183 100644
--- a/src/language/utils/EmbeddedDiscreteFunctionMathFunctions.cpp
+++ b/src/language/utils/EmbeddedDiscreteFunctionMathFunctions.cpp
@@ -6,7 +6,6 @@
 #include <scheme/DiscreteFunctionP0Vector.hpp>
 #include <scheme/DiscreteFunctionUtils.hpp>
 #include <scheme/DiscreteFunctionVariant.hpp>
-#include <scheme/IDiscreteFunction.hpp>
 #include <scheme/IDiscreteFunctionDescriptor.hpp>
 
 #include <utils/Demangle.hpp>
diff --git a/src/output/WriterBase.hpp b/src/output/WriterBase.hpp
index ae57e9af27bc82333f7d8350cd8bff92235befc4..7fae994d78ed0e97be8f10d63097464280c739fc 100644
--- a/src/output/WriterBase.hpp
+++ b/src/output/WriterBase.hpp
@@ -10,7 +10,6 @@
 
 class IMesh;
 class OutputNamedItemDataSet;
-class IDiscreteFunction;
 class NamedDiscreteFunction;
 
 class WriterBase : public IWriter