diff --git a/apps/calculation/app.cpp b/apps/calculation/app.cpp
index fc09d13a8..5cb19d37d 100644
--- a/apps/calculation/app.cpp
+++ b/apps/calculation/app.cpp
@@ -1,5 +1,4 @@
 #include "app.h"
-#include "../apps_container.h"
 #include "calculation_icon.h"
 #include <apps/i18n.h>
 #include <poincare/symbol.h>
diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index 116cf869f..3b30b042f 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -1,6 +1,5 @@
 #include "edit_expression_controller.h"
 #include "app.h"
-#include "../apps_container.h"
 #include <ion/display.h>
 #include <poincare/preferences.h>
 #include <assert.h>
diff --git a/apps/calculation/history_controller.cpp b/apps/calculation/history_controller.cpp
index 3b75f6ee6..71d193f39 100644
--- a/apps/calculation/history_controller.cpp
+++ b/apps/calculation/history_controller.cpp
@@ -1,6 +1,5 @@
 #include "history_controller.h"
 #include "app.h"
-#include "../apps_container.h"
 #include <assert.h>
 
 using namespace Shared;
diff --git a/apps/code/app.cpp b/apps/code/app.cpp
index e97f72a76..609ea672a 100644
--- a/apps/code/app.cpp
+++ b/apps/code/app.cpp
@@ -1,5 +1,4 @@
 #include "app.h"
-#include "../apps_container.h"
 #include "code_icon.h"
 #include <apps/i18n.h>
 #include "helpers.h"
diff --git a/apps/hardware_test/app.cpp b/apps/hardware_test/app.cpp
index 57810c0b4..6af62791a 100644
--- a/apps/hardware_test/app.cpp
+++ b/apps/hardware_test/app.cpp
@@ -1,5 +1,4 @@
 #include "app.h"
-#include "../apps_container.h"
 
 extern "C" {
 #include <assert.h>
diff --git a/apps/hardware_test/app.h b/apps/hardware_test/app.h
index ac789f0ae..de13e765f 100644
--- a/apps/hardware_test/app.h
+++ b/apps/hardware_test/app.h
@@ -8,8 +8,6 @@
 #include "battery_test_controller.h"
 #include "serial_number_controller.h"
 
-class AppsContainer;
-
 namespace HardwareTest {
 
 class App : public ::App {
diff --git a/apps/home/app.h b/apps/home/app.h
index 9e89696e9..cdbf95b1b 100644
--- a/apps/home/app.h
+++ b/apps/home/app.h
@@ -4,8 +4,6 @@
 #include <escher.h>
 #include "controller.h"
 
-class AppsContainer;
-
 namespace Home {
 
 class App : public ::App {
diff --git a/apps/home/controller.h b/apps/home/controller.h
index d31fd4632..a7762d433 100644
--- a/apps/home/controller.h
+++ b/apps/home/controller.h
@@ -4,8 +4,6 @@
 #include <escher.h>
 #include "app_cell.h"
 
-class AppsContainer;
-
 namespace Home {
 
 class Controller : public ViewController, public SimpleTableViewDataSource, public SelectableTableViewDelegate {
diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index e422a3884..007f938ab 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -1,6 +1,5 @@
 #include "calculation_controller.h"
 #include "../constant.h"
-#include "../apps_container.h"
 #include "../shared/poincare_helpers.h"
 #include "app.h"
 #include "calculation/discrete_calculation.h"
diff --git a/apps/regression/store.cpp b/apps/regression/store.cpp
index 7174cb8d3..120db5cea 100644
--- a/apps/regression/store.cpp
+++ b/apps/regression/store.cpp
@@ -1,6 +1,5 @@
 #include "store.h"
 #include "linear_model_helper.h"
-#include "apps/apps_container.h"
 #include <poincare/preferences.h>
 #include <assert.h>
 #include <float.h>
diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp
index 5674f4837..fac6aba66 100644
--- a/apps/sequence/list/list_parameter_controller.cpp
+++ b/apps/sequence/list/list_parameter_controller.cpp
@@ -1,7 +1,6 @@
 #include "list_parameter_controller.h"
 #include "list_controller.h"
 #include "../app.h"
-#include "../../apps_container.h"
 #include "../../shared/poincare_helpers.h"
 
 using namespace Poincare;
diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp
index a8096d0de..1596f6e44 100644
--- a/apps/settings/sub_menu/about_controller.cpp
+++ b/apps/settings/sub_menu/about_controller.cpp
@@ -1,10 +1,7 @@
 #include "about_controller.h"
-#include "../../apps_container.h"
 #include <assert.h>
 #include <cmath>
 
-using namespace Shared;
-
 namespace Settings {
 
 AboutController::AboutController(Responder * parentResponder) :
diff --git a/apps/settings/sub_menu/generic_sub_controller.cpp b/apps/settings/sub_menu/generic_sub_controller.cpp
index e70e3f747..80ff32d8b 100644
--- a/apps/settings/sub_menu/generic_sub_controller.cpp
+++ b/apps/settings/sub_menu/generic_sub_controller.cpp
@@ -1,10 +1,8 @@
 #include "generic_sub_controller.h"
-#include "../../apps_container.h"
 #include <assert.h>
 #include <cmath>
 
 using namespace Poincare;
-using namespace Shared;
 
 namespace Settings {
 
diff --git a/apps/shared/editable_cell_table_view_controller.cpp b/apps/shared/editable_cell_table_view_controller.cpp
index 03049a14c..abe82f111 100644
--- a/apps/shared/editable_cell_table_view_controller.cpp
+++ b/apps/shared/editable_cell_table_view_controller.cpp
@@ -1,5 +1,4 @@
 #include "editable_cell_table_view_controller.h"
-#include "../apps_container.h"
 #include "../shared/poincare_helpers.h"
 #include "../constant.h"
 #include "text_field_delegate_app.h"
diff --git a/apps/shared/expression_field_delegate_app.cpp b/apps/shared/expression_field_delegate_app.cpp
index f2e386778..6dab7a879 100644
--- a/apps/shared/expression_field_delegate_app.cpp
+++ b/apps/shared/expression_field_delegate_app.cpp
@@ -1,7 +1,7 @@
 #include "expression_field_delegate_app.h"
 #include <escher.h>
 #include <apps/i18n.h>
-#include "../apps_container.h"
+#include <poincare/expression.h>
 
 using namespace Poincare;
 
diff --git a/apps/shared/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp
index 3f210dce1..1bdabcc6c 100644
--- a/apps/shared/float_parameter_controller.cpp
+++ b/apps/shared/float_parameter_controller.cpp
@@ -1,6 +1,5 @@
 #include "float_parameter_controller.h"
 #include "../constant.h"
-#include "../apps_container.h"
 #include "../shared/poincare_helpers.h"
 #include "text_field_delegate_app.h"
 #include <assert.h>
diff --git a/apps/shared/function_app.cpp b/apps/shared/function_app.cpp
index 58d3f9f3b..fea059c2d 100644
--- a/apps/shared/function_app.cpp
+++ b/apps/shared/function_app.cpp
@@ -1,5 +1,4 @@
 #include "function_app.h"
-#include "../apps_container.h"
 
 using namespace Poincare;
 
diff --git a/apps/shared/function_app.h b/apps/shared/function_app.h
index 86300c8f5..687e6185a 100644
--- a/apps/shared/function_app.h
+++ b/apps/shared/function_app.h
@@ -6,8 +6,6 @@
 #include "curve_view_cursor.h"
 #include "interval.h"
 
-class AppsContainer;
-
 namespace Shared {
 
 class FunctionApp : public ExpressionFieldDelegateApp {
diff --git a/apps/shared/input_event_handler_delegate_app.h b/apps/shared/input_event_handler_delegate_app.h
index e869383b1..3f2927c9c 100644
--- a/apps/shared/input_event_handler_delegate_app.h
+++ b/apps/shared/input_event_handler_delegate_app.h
@@ -3,8 +3,6 @@
 
 #include <escher.h>
 
-class AppsContainer;
-
 namespace Shared {
 
 class InputEventHandlerDelegateApp : public ::App, public InputEventHandlerDelegate {
diff --git a/apps/shared/message_controller.cpp b/apps/shared/message_controller.cpp
index 81521f96e..cab2151c5 100644
--- a/apps/shared/message_controller.cpp
+++ b/apps/shared/message_controller.cpp
@@ -1,5 +1,4 @@
 #include "message_controller.h"
-#include "../apps_container.h"
 
 MessageController::MessageController(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages) :
   ViewController(nullptr),
diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp
index cae297599..4fb1806f1 100644
--- a/apps/shared/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -1,6 +1,5 @@
 #include "range_parameter_controller.h"
 #include "text_field_delegate_app.h"
-#include "../apps_container.h"
 #include <assert.h>
 
 using namespace Poincare;
@@ -124,4 +123,3 @@ int RangeParameterController::reusableParameterCellCount(int type) {
 }
 
 }
-
diff --git a/apps/shared/sum_graph_controller.cpp b/apps/shared/sum_graph_controller.cpp
index 1c4f5b8e5..559809812 100644
--- a/apps/shared/sum_graph_controller.cpp
+++ b/apps/shared/sum_graph_controller.cpp
@@ -1,6 +1,5 @@
 #include "sum_graph_controller.h"
 #include "function_app.h"
-#include "../apps_container.h"
 #include <poincare/empty_layout.h>
 #include <poincare/condensed_sum_layout.h>
 #include <poincare/layout_helper.h>
diff --git a/apps/shared/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h
index c7d1fa7e2..c9f96b29c 100644
--- a/apps/shared/text_field_delegate_app.h
+++ b/apps/shared/text_field_delegate_app.h
@@ -6,8 +6,6 @@
 #include "input_event_handler_delegate_app.h"
 #include <apps/i18n.h>
 
-class AppsContainer;
-
 namespace Shared {
 
 class TextFieldDelegateApp : public InputEventHandlerDelegateApp, public TextFieldDelegate {
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index 542830b29..559faa97e 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -1,7 +1,6 @@
 #include "values_controller.h"
 #include "function_app.h"
 #include "../constant.h"
-#include "../apps_container.h"
 #include "poincare_helpers.h"
 #include <assert.h>
 
@@ -342,4 +341,3 @@ FunctionStore * ValuesController::functionStore() const {
 }
 
 }
-
diff --git a/apps/statistics/box_controller.cpp b/apps/statistics/box_controller.cpp
index 2e26b3565..54e6b30cb 100644
--- a/apps/statistics/box_controller.cpp
+++ b/apps/statistics/box_controller.cpp
@@ -1,7 +1,6 @@
 #include "box_controller.h"
 #include "app.h"
 #include "../shared/poincare_helpers.h"
-#include "../apps_container.h"
 
 using namespace Poincare;
 using namespace Shared;
diff --git a/apps/statistics/calculation_controller.cpp b/apps/statistics/calculation_controller.cpp
index 4a8e78062..1524d61c8 100644
--- a/apps/statistics/calculation_controller.cpp
+++ b/apps/statistics/calculation_controller.cpp
@@ -1,5 +1,5 @@
 #include "calculation_controller.h"
-#include "../apps_container.h"
+#include <apps/i18n.h>
 #include "../shared/poincare_helpers.h"
 #include <assert.h>
 
diff --git a/apps/statistics/histogram_controller.cpp b/apps/statistics/histogram_controller.cpp
index 60b0e5338..1e5b9320c 100644
--- a/apps/statistics/histogram_controller.cpp
+++ b/apps/statistics/histogram_controller.cpp
@@ -1,5 +1,4 @@
 #include "histogram_controller.h"
-#include "../apps_container.h"
 #include "../shared/poincare_helpers.h"
 #include "../shared/text_helpers.h"
 #include "app.h"
diff --git a/apps/usb/app.cpp b/apps/usb/app.cpp
index ec0125f9b..99cdd7a6c 100644
--- a/apps/usb/app.cpp
+++ b/apps/usb/app.cpp
@@ -1,5 +1,5 @@
 #include "app.h"
-#include "../apps_container.h"
+#include <apps/i18n.h>
 #include <assert.h>
 
 namespace USB {