From 6356c7f276d09ab32d6f1c1338dac0b00a602232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Mon, 13 Sep 2021 20:35:51 +0200
Subject: [PATCH] Fix DisplayAppRecovery : fix include error by forward
 declaring Controllers in header file.

---
 src/displayapp/DisplayAppRecovery.cpp |  1 +
 src/displayapp/DisplayAppRecovery.h   | 32 ++++++++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index 17612ef0..7a202629 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -5,6 +5,7 @@
 #include <components/rle/RleDecoder.h>
 #include <touchhandler/TouchHandler.h>
 #include "displayapp/icons/infinitime/infinitime-nb.c"
+#include "components/ble/BleController.h"
 
 using namespace Pinetime::Applications;
 
diff --git a/src/displayapp/DisplayAppRecovery.h b/src/displayapp/DisplayAppRecovery.h
index 8b2bc7f5..4184ea49 100644
--- a/src/displayapp/DisplayAppRecovery.h
+++ b/src/displayapp/DisplayAppRecovery.h
@@ -6,32 +6,38 @@
 #include <bits/unique_ptr.h>
 #include <queue.h>
 #include "components/gfx/Gfx.h"
-#include "components/battery/BatteryController.h"
-#include "components/brightness/BrightnessController.h"
-#include "components/ble/BleController.h"
-#include "components/datetime/DateTimeController.h"
-#include "components/ble/NotificationManager.h"
-#include "components/firmwarevalidator/FirmwareValidator.h"
 #include "drivers/Cst816s.h"
 #include <date/date.h>
 #include <drivers/Watchdog.h>
-#include <components/heartrate/HeartRateController.h>
-#include <components/motion/MotionController.h>
 #include <components/motor/MotorController.h>
-#include <components/settings/Settings.h>
 #include "TouchEvents.h"
 #include "Apps.h"
 #include "Messages.h"
 #include "DummyLittleVgl.h"
-#include "components/timer/TimerController.h"
 
 namespace Pinetime {
+  namespace Drivers {
+    class St7789;
+    class Cst816S;
+    class WatchdogView;
+  }
+  namespace Controllers {
+    class Settings;
+    class Battery;
+    class Ble;
+    class DateTime;
+    class NotificationManager;
+    class HeartRateController;
+    class MotionController;
+    class TouchHandler;
+    class MotorController;
+    class TimerController;
+  }
+
   namespace System {
     class SystemTask;
   };
-  namespace Controllers {
-    class TouchHandler;
-  }
+
   namespace Applications {
     class DisplayApp {
     public: