diff --git a/poincare/include/poincare/expression_layout.h b/poincare/include/poincare/expression_layout.h
index 3337adca1..a04c627c8 100644
--- a/poincare/include/poincare/expression_layout.h
+++ b/poincare/include/poincare/expression_layout.h
@@ -3,11 +3,11 @@
 
 #include <kandinsky.h>
 #include <poincare/print_float.h>
+#include <poincare/expression_layout_cursor.h>
+
 
 namespace Poincare {
 
-class ExpressionLayoutCursor;
-
 class ExpressionLayout {
 public:
   enum class VerticalDirection {
diff --git a/poincare/include/poincare/expression_layout_cursor.h b/poincare/include/poincare/expression_layout_cursor.h
index 5bdc266c6..e0473c915 100644
--- a/poincare/include/poincare/expression_layout_cursor.h
+++ b/poincare/include/poincare/expression_layout_cursor.h
@@ -1,11 +1,12 @@
 #ifndef POINCARE_EXPRESSION_LAYOUT_CURSOR_H
 #define POINCARE_EXPRESSION_LAYOUT_CURSOR_H
 
-#include <poincare/expression_layout.h>
 #include <kandinsky/point.h>
 
 namespace Poincare {
 
+class ExpressionLayout;
+
 class ExpressionLayoutCursor {
 public:
   enum class Position {
diff --git a/poincare/src/expression_layout_cursor.cpp b/poincare/src/expression_layout_cursor.cpp
index e5a1711c7..102f63e58 100644
--- a/poincare/src/expression_layout_cursor.cpp
+++ b/poincare/src/expression_layout_cursor.cpp
@@ -1,4 +1,5 @@
 #include <poincare/expression_layout_cursor.h>
+#include <poincare/expression_layout.h>
 #include <poincare/expression_layout_array.h>
 #include <poincare_layouts.h> //TODO: finer include?
 #include <ion/charset.h>