From c3475b92fad2eff4b2a43e5343863d11fe4caca3 Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Sun, 15 Nov 2020 05:04:22 +0100
Subject: [PATCH 1/5] Include cleanup: drivers

---
 src/drivers/BufferProvider.h  |  1 +
 src/drivers/Cst816s.cpp       |  9 +++++----
 src/drivers/Cst816s.h         |  1 -
 src/drivers/DebugPins.cpp     |  2 +-
 src/drivers/InternalFlash.cpp |  2 +-
 src/drivers/Spi.cpp           |  2 +-
 src/drivers/Spi.h             |  6 ------
 src/drivers/SpiMaster.cpp     |  6 ++----
 src/drivers/SpiMaster.h       | 10 +++-------
 src/drivers/SpiNorFlash.cpp   |  2 +-
 src/drivers/SpiNorFlash.h     |  1 +
 src/drivers/St7789.cpp        |  2 +-
 src/drivers/St7789.h          |  1 +
 src/drivers/TwiMaster.cpp     |  6 +++---
 src/drivers/TwiMaster.h       |  2 --
 src/drivers/Watchdog.cpp      |  4 +---
 src/drivers/Watchdog.h        |  1 +
 17 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/drivers/BufferProvider.h b/src/drivers/BufferProvider.h
index 50fa253e..1be4317a 100644
--- a/src/drivers/BufferProvider.h
+++ b/src/drivers/BufferProvider.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/Cst816s.cpp b/src/drivers/Cst816s.cpp
index 94db3b34..e703b73b 100644
--- a/src/drivers/Cst816s.cpp
+++ b/src/drivers/Cst816s.cpp
@@ -1,8 +1,9 @@
-#include <FreeRTOS.h>
-#include <task.h>
-#include <nrfx_log.h>
-#include <legacy/nrf_drv_gpiote.h>
 #include "Cst816s.h"
+#include <FreeRTOS.h>
+#include <legacy/nrf_drv_gpiote.h>
+#include <nrfx_log.h>
+#include <task.h>
+
 using namespace Pinetime::Drivers;
 
 /* References :
diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 4569e82f..b7876b88 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <nrfx_twi.h>
 #include "TwiMaster.h"
 
 namespace Pinetime {
diff --git a/src/drivers/DebugPins.cpp b/src/drivers/DebugPins.cpp
index 5a12fd86..8457ba5f 100644
--- a/src/drivers/DebugPins.cpp
+++ b/src/drivers/DebugPins.cpp
@@ -1,5 +1,5 @@
-#include <hal/nrf_gpio.h>
 #include "DebugPins.h"
+#include <hal/nrf_gpio.h>
 
 #ifdef USE_DEBUG_PINS
 void debugpins_init() {
diff --git a/src/drivers/InternalFlash.cpp b/src/drivers/InternalFlash.cpp
index db705d78..33c14473 100644
--- a/src/drivers/InternalFlash.cpp
+++ b/src/drivers/InternalFlash.cpp
@@ -1,5 +1,5 @@
-#include <mdk/nrf.h>
 #include "InternalFlash.h"
+#include <mdk/nrf.h>
 using namespace Pinetime::Drivers;
 
 void InternalFlash::ErasePage(uint32_t address) {
diff --git a/src/drivers/Spi.cpp b/src/drivers/Spi.cpp
index 2d8aa3b8..0e7de4d5 100644
--- a/src/drivers/Spi.cpp
+++ b/src/drivers/Spi.cpp
@@ -1,6 +1,6 @@
+#include "Spi.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_log.h>
-#include "Spi.h"
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/Spi.h b/src/drivers/Spi.h
index 82ba8a65..e3cab459 100644
--- a/src/drivers/Spi.h
+++ b/src/drivers/Spi.h
@@ -1,12 +1,6 @@
 #pragma once
-#include <FreeRTOS.h>
 #include <cstdint>
 #include <cstddef>
-#include <array>
-#include <atomic>
-#include <task.h>
-
-#include "BufferProvider.h"
 #include "SpiMaster.h"
 
 namespace Pinetime {
diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp
index 2e5852a5..5f7c0642 100644
--- a/src/drivers/SpiMaster.cpp
+++ b/src/drivers/SpiMaster.cpp
@@ -1,10 +1,8 @@
-#include <FreeRTOS.h>
+#include "SpiMaster.h"
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_spim.h>
-#include "SpiMaster.h"
-#include <algorithm>
-#include <task.h>
 #include <nrfx_log.h>
+#include <algorithm>
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index cd3193e4..cb79d90c 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -1,14 +1,10 @@
 #pragma once
-#include <FreeRTOS.h>
-#include <cstdint>
 #include <cstddef>
-#include <array>
-#include <atomic>
-#include <task.h>
-#include <semphr.h>
+#include <cstdint>
 
-#include "BufferProvider.h"
+#include <FreeRTOS.h>
 #include <semphr.h>
+#include <task.h>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/SpiNorFlash.cpp b/src/drivers/SpiNorFlash.cpp
index bd24834e..3ea5afe7 100644
--- a/src/drivers/SpiNorFlash.cpp
+++ b/src/drivers/SpiNorFlash.cpp
@@ -1,7 +1,7 @@
+#include "SpiNorFlash.h"
 #include <hal/nrf_gpio.h>
 #include <libraries/delay/nrf_delay.h>
 #include <libraries/log/nrf_log.h>
-#include "SpiNorFlash.h"
 #include "Spi.h"
 
 using namespace Pinetime::Drivers;
diff --git a/src/drivers/SpiNorFlash.h b/src/drivers/SpiNorFlash.h
index 10c25a01..7702d434 100644
--- a/src/drivers/SpiNorFlash.h
+++ b/src/drivers/SpiNorFlash.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index ed28c82c..2df2c531 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -1,7 +1,7 @@
+#include "St7789.h"
 #include <hal/nrf_gpio.h>
 #include <libraries/delay/nrf_delay.h>
 #include <nrfx_log.h>
-#include "St7789.h"
 #include "Spi.h"
 
 using namespace Pinetime::Drivers;
diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h
index 0b94cf24..053caccb 100644
--- a/src/drivers/St7789.h
+++ b/src/drivers/St7789.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp
index 3ff8a952..6a063ecf 100644
--- a/src/drivers/TwiMaster.cpp
+++ b/src/drivers/TwiMaster.cpp
@@ -1,7 +1,7 @@
-#include <nrfx_log.h>
-#include <hal/nrf_gpio.h>
-#include <cstring>
 #include "TwiMaster.h"
+#include <cstring>
+#include <hal/nrf_gpio.h>
+#include <nrfx_log.h>
 
 using namespace Pinetime::Drivers;
 
diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index 52e39098..cc0b6f02 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -1,8 +1,6 @@
 #pragma once
 #include <FreeRTOS.h>
 #include <semphr.h>
-#include <drivers/include/nrfx_twi.h>
-
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/drivers/Watchdog.cpp b/src/drivers/Watchdog.cpp
index 11da1211..d09fbcd1 100644
--- a/src/drivers/Watchdog.cpp
+++ b/src/drivers/Watchdog.cpp
@@ -1,7 +1,5 @@
-#include <mdk/nrf52.h>
-#include <mdk/nrf52_bitfields.h>
-#include <nrf_soc.h>
 #include "Watchdog.h"
+#include <mdk/nrf.h>
 using namespace Pinetime::Drivers;
 
 
diff --git a/src/drivers/Watchdog.h b/src/drivers/Watchdog.h
index 73f99ea1..0c816a4e 100644
--- a/src/drivers/Watchdog.h
+++ b/src/drivers/Watchdog.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {

From 1516573df46239ea76b7a8b142a6b719668cb26d Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Sun, 15 Nov 2020 15:05:51 +0100
Subject: [PATCH 2/5] Include cleanup: components

---
 src/components/battery/BatteryController.cpp  |  3 +-
 src/components/battery/BatteryController.h    |  2 +-
 .../ble/AlertNotificationClient.cpp           | 10 ++--
 src/components/ble/AlertNotificationClient.h  | 14 ++++-
 .../ble/AlertNotificationService.cpp          | 13 ++---
 src/components/ble/AlertNotificationService.h | 10 ++++
 .../ble/BatteryInformationService.h           |  4 ++
 src/components/ble/BleController.cpp          |  2 -
 src/components/ble/BleController.h            |  3 +-
 src/components/ble/CurrentTimeClient.cpp      |  3 +-
 src/components/ble/CurrentTimeClient.h        | 12 ++--
 src/components/ble/CurrentTimeService.h       |  4 ++
 src/components/ble/DeviceInformationService.h |  9 +--
 src/components/ble/DfuService.cpp             |  8 +--
 src/components/ble/DfuService.h               |  4 ++
 src/components/ble/ImmediateAlertService.cpp  |  6 +-
 src/components/ble/ImmediateAlertService.h    |  4 ++
 src/components/ble/MusicService.cpp           |  2 +-
 src/components/ble/MusicService.h             |  7 ++-
 src/components/ble/NimbleController.cpp       | 24 ++++----
 src/components/ble/NimbleController.h         | 31 ++++++----
 src/components/ble/NotificationManager.cpp    |  2 +-
 src/components/ble/NotificationManager.h      |  4 +-
 src/components/ble/ServiceDiscovery.cpp       |  4 +-
 src/components/ble/ServiceDiscovery.h         |  6 +-
 .../brightness/BrightnessController.cpp       |  2 +-
 .../firmwarevalidator/FirmwareValidator.cpp   |  6 +-
 src/components/gfx/Gfx.cpp                    |  5 +-
 src/components/gfx/Gfx.h                      |  8 +--
 src/logging/NrfLogger.cpp                     |  7 +--
 src/logging/NrfLogger.h                       |  3 +
 src/main.cpp                                  | 56 +++++++++++--------
 src/main.h                                    |  1 +
 src/systemtask/SystemTask.cpp                 | 32 +++++++----
 src/systemtask/SystemTask.h                   | 20 ++++---
 35 files changed, 207 insertions(+), 124 deletions(-)

diff --git a/src/components/battery/BatteryController.cpp b/src/components/battery/BatteryController.cpp
index 571efae6..3e3d65b4 100644
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@@ -1,8 +1,7 @@
-#include <drivers/include/nrfx_saadc.h>
+#include "BatteryController.h"
 #include <hal/nrf_gpio.h>
 #include <libraries/log/nrf_log.h>
 #include <algorithm>
-#include "BatteryController.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index f07648a9..7cc964e4 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -1,7 +1,7 @@
 #pragma once
+#include <cstdint>
 #include <drivers/include/nrfx_saadc.h>
 
-
 namespace Pinetime {
   namespace Controllers {
     class Battery {
diff --git a/src/components/ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp
index abe41099..e7a18626 100644
--- a/src/components/ble/AlertNotificationClient.cpp
+++ b/src/components/ble/AlertNotificationClient.cpp
@@ -1,7 +1,7 @@
-#include <systemtask/SystemTask.h>
-#include "NotificationManager.h"
-
 #include "AlertNotificationClient.h"
+#include <algorithm>
+#include "NotificationManager.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 constexpr ble_uuid16_t AlertNotificationClient::ansServiceUuid;
@@ -159,8 +159,8 @@ void AlertNotificationClient::OnNotification(ble_gap_event *event) {
     const auto maxBufferSize{maxMessageSize + headerSize};
 
     const auto dbgPacketLen = OS_MBUF_PKTLEN(event->notify_rx.om);
-    size_t bufferSize = min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
-    auto messageSize = min(maxMessageSize, (bufferSize - headerSize));
+    size_t bufferSize = std::min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
+    auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
 
     NotificationManager::Notification notif;
     os_mbuf_copydata(event->notify_rx.om, headerSize, messageSize - 1, notif.message.data());
diff --git a/src/components/ble/AlertNotificationClient.h b/src/components/ble/AlertNotificationClient.h
index bc0df51e..fa10456c 100644
--- a/src/components/ble/AlertNotificationClient.h
+++ b/src/components/ble/AlertNotificationClient.h
@@ -1,13 +1,23 @@
 #pragma once
 
 #include <cstdint>
-#include <array>
+#include <functional>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 #include "BleClient.h"
 
-
 namespace Pinetime {
+
+  namespace System {
+    class SystemTask;
+  }
+
   namespace Controllers {
+    class NotificationManager;
+
     class AlertNotificationClient : public BleClient {
       public:
         explicit AlertNotificationClient(Pinetime::System::SystemTask &systemTask,
diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp
index 32711b92..3156470c 100644
--- a/src/components/ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@@ -1,10 +1,9 @@
-
-#include <hal/nrf_rtc.h>
-#include "NotificationManager.h"
-#include <systemtask/SystemTask.h>
-
 #include "AlertNotificationService.h"
+#include <hal/nrf_rtc.h>
 #include <cstring>
+#include <algorithm>
+#include "NotificationManager.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 
@@ -60,8 +59,8 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
     const auto maxBufferSize{maxMessageSize + headerSize};
 
     const auto dbgPacketLen = OS_MBUF_PKTLEN(ctxt->om);
-    size_t bufferSize = min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
-    auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
+    size_t bufferSize = std::min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
+    auto messageSize = std::min(maxMessageSize, (bufferSize-headerSize));
 
     NotificationManager::Notification notif;
     os_mbuf_copydata(ctxt->om, headerSize, messageSize-1, notif.message.data());
diff --git a/src/components/ble/AlertNotificationService.h b/src/components/ble/AlertNotificationService.h
index 1b8c4989..120312d2 100644
--- a/src/components/ble/AlertNotificationService.h
+++ b/src/components/ble/AlertNotificationService.h
@@ -1,10 +1,20 @@
 #pragma once
 #include <cstdint>
 #include <array>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 
 namespace Pinetime {
+
+  namespace System {
+    class SystemTask;
+  }
   namespace Controllers {
+    class NotificationManager;
+
     class AlertNotificationService {
       public:
         AlertNotificationService(Pinetime::System::SystemTask &systemTask,
diff --git a/src/components/ble/BatteryInformationService.h b/src/components/ble/BatteryInformationService.h
index 74b2222c..b00000a4 100644
--- a/src/components/ble/BatteryInformationService.h
+++ b/src/components/ble/BatteryInformationService.h
@@ -1,5 +1,9 @@
 #pragma once
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 
 namespace Pinetime {
   namespace System {
diff --git a/src/components/ble/BleController.cpp b/src/components/ble/BleController.cpp
index 2b396e12..650ec79f 100644
--- a/src/components/ble/BleController.cpp
+++ b/src/components/ble/BleController.cpp
@@ -1,5 +1,3 @@
-#include <cstring>
-#include <cstdlib>
 #include "BleController.h"
 
 using namespace Pinetime::Controllers;
diff --git a/src/components/ble/BleController.h b/src/components/ble/BleController.h
index 3f52ea25..0570c8d0 100644
--- a/src/components/ble/BleController.h
+++ b/src/components/ble/BleController.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <FreeRTOS.h>
-#include <queue.h>
 #include <array>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/components/ble/CurrentTimeClient.cpp b/src/components/ble/CurrentTimeClient.cpp
index 92f9374b..be50fede 100644
--- a/src/components/ble/CurrentTimeClient.cpp
+++ b/src/components/ble/CurrentTimeClient.cpp
@@ -1,5 +1,6 @@
-#include <hal/nrf_rtc.h>
 #include "CurrentTimeClient.h"
+#include <hal/nrf_rtc.h>
+#include "components/datetime/DateTimeController.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/CurrentTimeClient.h b/src/components/ble/CurrentTimeClient.h
index 93139399..1b2e018c 100644
--- a/src/components/ble/CurrentTimeClient.h
+++ b/src/components/ble/CurrentTimeClient.h
@@ -1,13 +1,15 @@
 #pragma once
-#include <cstdint>
-#include <array>
-
-#include "components/datetime/DateTimeController.h"
-#include "BleClient.h"
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
+#include <cstdint>
+#include "BleClient.h"
 
 namespace Pinetime {
     namespace Controllers {
+        class DateTime;
 
         class CurrentTimeClient : public BleClient {
         public:
diff --git a/src/components/ble/CurrentTimeService.h b/src/components/ble/CurrentTimeService.h
index a6be9647..23956283 100644
--- a/src/components/ble/CurrentTimeService.h
+++ b/src/components/ble/CurrentTimeService.h
@@ -3,7 +3,11 @@
 #include <array>
 
 #include "components/datetime/DateTimeController.h"
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/components/ble/DeviceInformationService.h b/src/components/ble/DeviceInformationService.h
index 25ab8402..94ca7bbf 100644
--- a/src/components/ble/DeviceInformationService.h
+++ b/src/components/ble/DeviceInformationService.h
@@ -1,9 +1,10 @@
 #pragma once
-#include <cstdint>
-#include <array>
-
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
-#include <Version.h>
+#undef max
+#undef min
+#include "Version.h"
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/components/ble/DfuService.cpp b/src/components/ble/DfuService.cpp
index 4dec5141..90795b49 100644
--- a/src/components/ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@@ -1,8 +1,8 @@
-#include <cstring>
-
-#include "components/ble/BleController.h"
-#include "systemtask/SystemTask.h"
 #include "DfuService.h"
+#include <cstring>
+#include "components/ble/BleController.h"
+#include "drivers/SpiNorFlash.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/DfuService.h b/src/components/ble/DfuService.h
index d7ba460c..096bd99a 100644
--- a/src/components/ble/DfuService.h
+++ b/src/components/ble/DfuService.h
@@ -3,7 +3,11 @@
 #include <cstdint>
 #include <array>
 
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 
 namespace Pinetime {
   namespace System {
diff --git a/src/components/ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp
index e2cee308..0f6bf6cf 100644
--- a/src/components/ble/ImmediateAlertService.cpp
+++ b/src/components/ble/ImmediateAlertService.cpp
@@ -1,7 +1,7 @@
-#include <systemtask/SystemTask.h>
-#include <cstring>
 #include "ImmediateAlertService.h"
-#include "AlertNotificationService.h"
+#include <cstring>
+#include "NotificationManager.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/ImmediateAlertService.h b/src/components/ble/ImmediateAlertService.h
index c42846c4..2bc9cba5 100644
--- a/src/components/ble/ImmediateAlertService.h
+++ b/src/components/ble/ImmediateAlertService.h
@@ -1,5 +1,9 @@
 #pragma once
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 
 namespace Pinetime {
   namespace System {
diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index 84f2972b..fdecb6b3 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -15,8 +15,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <systemtask/SystemTask.h>
 #include "MusicService.h"
+#include "systemtask/SystemTask.h"
 
 int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
   auto musicService = static_cast<Pinetime::Controllers::MusicService *>(arg);
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h
index b365909b..ee3628b0 100644
--- a/src/components/ble/MusicService.h
+++ b/src/components/ble/MusicService.h
@@ -18,10 +18,13 @@
 #pragma once
 
 #include <cstdint>
-#include <array>
+#include <string>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
 #include <host/ble_uuid.h>
-#include <string>
+#undef max
+#undef min
 
 //c7e50000-78fc-48fe-8e23-43b37a1942d0
 #define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7}
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index af7f4029..a6f3cc39 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -1,15 +1,19 @@
-#include "components/datetime/DateTimeController.h"
-#include <systemtask/SystemTask.h>
-#include "components/ble/NotificationManager.h"
-#include <hal/nrf_rtc.h>
 #include "NimbleController.h"
-#include "MusicService.h"
-#include <services/gatt/ble_svc_gatt.h>
-#include <services/gap/ble_svc_gap.h>
-#include <host/util/util.h>
-#include <host/ble_hs_id.h>
-#include <host/ble_hs.h>
+#include <hal/nrf_rtc.h>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#include <host/ble_hs.h>
+#include <host/ble_hs_id.h>
+#include <host/util/util.h>
+#undef max
+#undef min
+#include <services/gap/ble_svc_gap.h>
+#include <services/gatt/ble_svc_gatt.h>
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/datetime/DateTimeController.h"
+#include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 8ddec1f9..914f11e6 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -2,24 +2,35 @@
 
 #include <cstdint>
 
-#include "AlertNotificationService.h"
-#include "AlertNotificationClient.h"
-#include "DeviceInformationService.h"
-#include "CurrentTimeClient.h"
-#include "DfuService.h"
-#include "CurrentTimeService.h"
-#include "MusicService.h"
-#include "BatteryInformationService.h"
-#include "ImmediateAlertService.h"
-#include "ServiceDiscovery.h"
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
+#include "AlertNotificationClient.h"
+#include "AlertNotificationService.h"
+#include "BatteryInformationService.h"
+#include "CurrentTimeClient.h"
+#include "CurrentTimeService.h"
+#include "DeviceInformationService.h"
+#include "DfuService.h"
+#include "ImmediateAlertService.h"
+#include "MusicService.h"
+#include "ServiceDiscovery.h"
 
 namespace Pinetime {
   namespace Drivers {
     class SpiNorFlash;
   }
+
+  namespace System {
+    class SystemTask;
+  }
+
   namespace Controllers {
+    class Ble;
     class DateTime;
+    class NotificationManager;
 
     class NimbleController {
 
diff --git a/src/components/ble/NotificationManager.cpp b/src/components/ble/NotificationManager.cpp
index 67711723..dabcb4ba 100644
--- a/src/components/ble/NotificationManager.cpp
+++ b/src/components/ble/NotificationManager.cpp
@@ -1,6 +1,6 @@
+#include "NotificationManager.h"
 #include <cstring>
 #include <algorithm>
-#include "NotificationManager.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/ble/NotificationManager.h b/src/components/ble/NotificationManager.h
index 49fe8306..036d2ed9 100644
--- a/src/components/ble/NotificationManager.h
+++ b/src/components/ble/NotificationManager.h
@@ -2,6 +2,8 @@
 
 #include <array>
 #include <atomic>
+#include <cstddef>
+#include <cstdint>
 
 namespace Pinetime {
   namespace Controllers {
@@ -27,7 +29,7 @@ namespace Pinetime {
       bool ClearNewNotificationFlag();
       bool AreNewNotificationsAvailable();
 
-      static constexpr uint8_t MaximumMessageSize() { return MessageSize; };
+      static constexpr size_t MaximumMessageSize() { return MessageSize; };
       size_t NbNotifications() const;
 
       private:
diff --git a/src/components/ble/ServiceDiscovery.cpp b/src/components/ble/ServiceDiscovery.cpp
index 4b29d89c..4d37b8bd 100644
--- a/src/components/ble/ServiceDiscovery.cpp
+++ b/src/components/ble/ServiceDiscovery.cpp
@@ -1,5 +1,7 @@
-#include <libraries/log/nrf_log.h>
 #include "ServiceDiscovery.h"
+#include <libraries/log/nrf_log.h>
+#include "BleClient.h"
+
 using namespace Pinetime::Controllers;
 
 ServiceDiscovery::ServiceDiscovery(std::array<BleClient*, 2>&& clients) : clients{clients} {
diff --git a/src/components/ble/ServiceDiscovery.h b/src/components/ble/ServiceDiscovery.h
index c86fc4ec..0b26bd1d 100644
--- a/src/components/ble/ServiceDiscovery.h
+++ b/src/components/ble/ServiceDiscovery.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <array>
-#include <functional>
-#include <memory>
-#include "BleClient.h"
+#include <cstdint>
 
 namespace Pinetime {
   namespace Controllers {
+    class BleClient;
+
     class ServiceDiscovery {
       public:
         ServiceDiscovery(std::array<BleClient*, 2>&& bleClients);
diff --git a/src/components/brightness/BrightnessController.cpp b/src/components/brightness/BrightnessController.cpp
index c8825d68..78c461d7 100644
--- a/src/components/brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
@@ -1,5 +1,5 @@
-#include <hal/nrf_gpio.h>
 #include "BrightnessController.h"
+#include <hal/nrf_gpio.h>
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/components/firmwarevalidator/FirmwareValidator.cpp b/src/components/firmwarevalidator/FirmwareValidator.cpp
index 244d5c06..48f98550 100644
--- a/src/components/firmwarevalidator/FirmwareValidator.cpp
+++ b/src/components/firmwarevalidator/FirmwareValidator.cpp
@@ -1,8 +1,8 @@
-#include <drivers/InternalFlash.h>
-#include <hal/nrf_rtc.h>
-
 #include "FirmwareValidator.h"
 
+#include <hal/nrf_rtc.h>
+#include "drivers/InternalFlash.h"
+
 using namespace Pinetime::Controllers;
 
 bool FirmwareValidator::IsValidated() const {
diff --git a/src/components/gfx/Gfx.cpp b/src/components/gfx/Gfx.cpp
index 3c5dbfb7..b9b94013 100644
--- a/src/components/gfx/Gfx.cpp
+++ b/src/components/gfx/Gfx.cpp
@@ -1,8 +1,5 @@
-#include <libraries/svc/nrf_svci.h>
-#include <FreeRTOS.h>
-#include <task.h>
 #include "Gfx.h"
-#include "../../drivers/St7789.h"
+#include "drivers/St7789.h"
 using namespace Pinetime::Components;
 
 Gfx::Gfx(Pinetime::Drivers::St7789 &lcd) : lcd{lcd} {
diff --git a/src/components/gfx/Gfx.h b/src/components/gfx/Gfx.h
index 091f06f5..35341e01 100644
--- a/src/components/gfx/Gfx.h
+++ b/src/components/gfx/Gfx.h
@@ -1,10 +1,10 @@
 #pragma once
-#include <cstdint>
-#include <nrf_font.h>
-#include <drivers/BufferProvider.h>
 #include <FreeRTOS.h>
+#include <nrf_font.h>
 #include <task.h>
-
+#include <cstddef>
+#include <cstdint>
+#include "drivers/BufferProvider.h"
 
 namespace Pinetime {
   namespace Drivers {
diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
index 0d95c06a..9f7624be 100644
--- a/src/logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
@@ -1,9 +1,8 @@
+#include "NrfLogger.h"
+
+#include <libraries/log/nrf_log.h>
 #include <libraries/log/nrf_log_ctrl.h>
 #include <libraries/log/nrf_log_default_backends.h>
-#include <FreeRTOS.h>
-#include <task.h>
-#include <libraries/log/nrf_log.h>
-#include "NrfLogger.h"
 
 using namespace Pinetime::Logging;
 
diff --git a/src/logging/NrfLogger.h b/src/logging/NrfLogger.h
index cb7089f2..fb68b919 100644
--- a/src/logging/NrfLogger.h
+++ b/src/logging/NrfLogger.h
@@ -1,6 +1,9 @@
 #pragma once
 #include "Logger.h"
 
+#include <FreeRTOS.h>
+#include <task.h>
+
 namespace Pinetime {
   namespace Logging{
     class NrfLogger : public Logger {
diff --git a/src/main.cpp b/src/main.cpp
index 45aac6de..35057045 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,32 +1,44 @@
+// nrf
+#include <hal/nrf_rtc.h>
+#include <hal/nrf_wdt.h>
+#include <legacy/nrf_drv_clock.h>
+#include <libraries/gpiote/app_gpiote.h>
+#include <libraries/timer/app_timer.h>
+#include <softdevice/common/nrf_sdh.h>
+
+// nimble
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <controller/ble_ll.h>
+#include <host/ble_hs.h>
+#include <host/util/util.h>
+#include <nimble/nimble_port.h>
+#include <nimble/nimble_port_freertos.h>
+#include <nimble/npl_freertos.h>
+#include <os/os_cputime.h>
+#include <services/gap/ble_svc_gap.h>
+#include <transport/ram/ble_hci_ram.h>
+#undef max
+#undef min
+
+// FreeRTOS
 #include <FreeRTOS.h>
 #include <task.h>
 #include <timers.h>
-#include <legacy/nrf_drv_clock.h>
-#include <hal/nrf_rtc.h>
-#include <hal/nrf_wdt.h>
-#include <os/os_cputime.h>
-#include <libraries/timer/app_timer.h>
-#include <libraries/gpiote/app_gpiote.h>
-#include "displayapp/DisplayApp.h"
-#include <softdevice/common/nrf_sdh.h>
-#include "components/datetime/DateTimeController.h"
+
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
-#include <drivers/St7789.h>
-#include <drivers/SpiMaster.h>
-#include <drivers/Spi.h>
+#include "components/datetime/DateTimeController.h"
+#include "displayapp/DisplayApp.h"
 #include "displayapp/LittleVgl.h"
-#include <systemtask/SystemTask.h>
-#include <nimble/nimble_port_freertos.h>
-#include <nimble/npl_freertos.h>
-#include <nimble/nimble_port.h>
-#include <host/ble_hs.h>
-#include <controller/ble_ll.h>
-#include <transport/ram/ble_hci_ram.h>
-#include <host/util/util.h>
-#include <services/gap/ble_svc_gap.h>
-
+#include "drivers/Spi.h"
+#include "drivers/SpiMaster.h"
+#include "drivers/SpiNorFlash.h"
+#include "drivers/St7789.h"
+#include "drivers/TwiMaster.h"
+#include "drivers/Cst816s.h"
+#include "systemtask/SystemTask.h"
 
 #if NRF_LOG_ENABLED
 #include "logging/NrfLogger.h"
diff --git a/src/main.h b/src/main.h
index b0a8a57e..2ff32b8f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2,6 +2,7 @@
 
 #include <FreeRTOS.h>
 #include <timers.h>
+#include <nrfx_gpiote.h>
 
 void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action);
 void DebounceTimerCallback(TimerHandle_t xTimer);
\ No newline at end of file
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index dac4ce29..81e7323a 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -1,19 +1,27 @@
-#include <libraries/log/nrf_log.h>
-#include <libraries/gpiote/app_gpiote.h>
-#include <drivers/Cst816s.h>
-#include "displayapp/LittleVgl.h"
-#include <hal/nrf_rtc.h>
-#include "components/ble/NotificationManager.h"
+#include "SystemTask.h"
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <host/ble_gap.h>
 #include <host/ble_gatt.h>
 #include <host/ble_hs_adv.h>
-#include "SystemTask.h"
-#include <nimble/hci_common.h>
-#include <host/ble_gap.h>
 #include <host/util/util.h>
-#include <drivers/InternalFlash.h>
+#include <nimble/hci_common.h>
+#undef max
+#undef min
+#include <hal/nrf_rtc.h>
+#include <libraries/gpiote/app_gpiote.h>
+#include <libraries/log/nrf_log.h>
+
+#include "BootloaderVersion.h"
+#include "components/ble/BleController.h"
+#include "displayapp/LittleVgl.h"
+#include "drivers/Cst816s.h"
+#include "drivers/St7789.h"
+#include "drivers/InternalFlash.h"
+#include "drivers/SpiMaster.h"
+#include "drivers/SpiNorFlash.h"
+#include "drivers/TwiMaster.h"
 #include "main.h"
-#include "components/ble/NimbleController.h"
-#include "../BootloaderVersion.h"
 
 using namespace Pinetime::System;
 
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 6ef0cfbf..fe6e7cbe 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -4,17 +4,23 @@
 
 #include <FreeRTOS.h>
 #include <task.h>
-#include <drivers/SpiMaster.h>
-#include <drivers/St7789.h>
-#include "components/battery/BatteryController.h"
-#include "displayapp/DisplayApp.h"
-#include <drivers/Watchdog.h>
-#include <drivers/SpiNorFlash.h>
+#include <timers.h>
+
 #include "SystemMonitor.h"
+#include "components/battery/BatteryController.h"
 #include "components/ble/NimbleController.h"
-#include "timers.h"
+#include "components/ble/NotificationManager.h"
+#include "displayapp/DisplayApp.h"
+#include "drivers/Watchdog.h"
 
 namespace Pinetime {
+  namespace Drivers {
+    class Cst816S;
+    class SpiMaster;
+    class SpiNorFlash;
+    class St7789;
+    class TwiMaster;
+  }
   namespace System {
     class SystemTask {
       public:

From cadc0c25d4f20653689c019b372a6822624c41b0 Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Sun, 15 Nov 2020 16:49:36 +0100
Subject: [PATCH 3/5] Include cleanup: displayapp + screens

---
 src/displayapp/DisplayApp.cpp                 | 29 +++++++-------
 src/displayapp/DisplayApp.h                   | 40 ++++++++++---------
 src/displayapp/LittleVgl.cpp                  | 16 +++-----
 src/displayapp/LittleVgl.h                    | 11 ++---
 src/displayapp/screens/ApplicationList.cpp    |  9 +++--
 src/displayapp/screens/ApplicationList.h      |  7 +---
 src/displayapp/screens/BatteryIcon.cpp        |  1 +
 src/displayapp/screens/BatteryIcon.h          |  2 -
 src/displayapp/screens/Brightness.cpp         |  2 +-
 src/displayapp/screens/Brightness.h           |  5 ++-
 src/displayapp/screens/Clock.cpp              | 17 ++++----
 src/displayapp/screens/Clock.h                | 20 +++++-----
 src/displayapp/screens/DropDownDemo.cpp       |  4 +-
 src/displayapp/screens/DropDownDemo.h         |  6 +--
 src/displayapp/screens/FirmwareUpdate.cpp     |  3 +-
 src/displayapp/screens/FirmwareUpdate.h       | 11 ++---
 src/displayapp/screens/FirmwareValidation.cpp |  8 ++--
 src/displayapp/screens/FirmwareValidation.h   |  5 +--
 src/displayapp/screens/Gauge.cpp              |  1 -
 src/displayapp/screens/Gauge.h                |  4 +-
 src/displayapp/screens/InfiniPaint.cpp        |  3 +-
 src/displayapp/screens/InfiniPaint.h          | 23 +++++------
 src/displayapp/screens/Label.cpp              |  1 -
 src/displayapp/screens/Label.h                |  1 -
 src/displayapp/screens/Meter.cpp              |  2 +-
 src/displayapp/screens/Meter.h                |  6 +--
 src/displayapp/screens/Modal.cpp              |  2 +-
 src/displayapp/screens/Modal.h                |  7 +---
 src/displayapp/screens/Music.cpp              |  8 +++-
 src/displayapp/screens/Music.h                | 20 +++-------
 src/displayapp/screens/Notifications.cpp      |  4 +-
 src/displayapp/screens/Notifications.h        |  9 ++---
 src/displayapp/screens/ScreenList.h           |  6 +--
 src/displayapp/screens/SystemInfo.cpp         | 14 ++++---
 src/displayapp/screens/SystemInfo.h           | 21 ++++++----
 src/displayapp/screens/Tab.cpp                | 19 ++++-----
 src/displayapp/screens/Tab.h                  | 12 +++---
 src/displayapp/screens/Tile.cpp               |  8 +---
 src/displayapp/screens/Tile.h                 |  8 ++--
 39 files changed, 174 insertions(+), 201 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index d4d41333..efc042b7 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -1,25 +1,24 @@
-#include <string>
-
 #include "DisplayApp.h"
-#include <FreeRTOS.h>
-#include <task.h>
 #include <libraries/log/nrf_log.h>
-#include <nrf_font.h>
-#include <queue.h>
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
 #include "components/datetime/DateTimeController.h"
-#include <drivers/Cst816s.h>
-#include "displayapp/screens/Notifications.h"
-#include "displayapp/screens/Tile.h"
-#include "displayapp/screens/Meter.h"
-#include "displayapp/screens/Gauge.h"
-#include "displayapp/screens/Brightness.h"
-#include "displayapp/screens/SystemInfo.h"
-#include "displayapp/screens/Music.h"
 #include "components/ble/NotificationManager.h"
-#include "displayapp/screens/FirmwareUpdate.h"
 #include "displayapp/screens/ApplicationList.h"
+#include "displayapp/screens/Brightness.h"
+#include "displayapp/screens/Clock.h"
+#include "displayapp/screens/FirmwareUpdate.h"
 #include "displayapp/screens/FirmwareValidation.h"
+#include "displayapp/screens/Gauge.h"
 #include "displayapp/screens/InfiniPaint.h"
+#include "displayapp/screens/Meter.h"
+#include "displayapp/screens/Music.h"
+#include "displayapp/screens/Notifications.h"
+#include "displayapp/screens/SystemInfo.h"
+#include "displayapp/screens/Tile.h"
+#include "drivers/Cst816s.h"
+#include "drivers/St7789.h"
+#include "drivers/Watchdog.h"
 #include "systemtask/SystemTask.h"
 
 using namespace Pinetime::Applications;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 2a0efde3..25cd2813 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -1,28 +1,30 @@
 #pragma once
 #include <FreeRTOS.h>
-#include <task.h>
-#include <drivers/St7789.h>
-#include <drivers/SpiMaster.h>
-#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 "LittleVgl.h"
 #include <date/date.h>
-#include "displayapp/screens/Clock.h"
-#include "displayapp/screens/Modal.h"
-#include <drivers/Watchdog.h>
-#include "TouchEvents.h"
+#include <queue.h>
+#include <task.h>
+#include <memory>
 #include "Apps.h"
-
+#include "LittleVgl.h"
+#include "TouchEvents.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
+#include "displayapp/screens/Modal.h"
 
 namespace Pinetime {
+
+  namespace Drivers {
+    class St7789;
+    class Cst816S;
+    class WatchdogView;
+  }
+  namespace Controllers {
+    class Battery;
+    class Ble;
+    class DateTime;
+    class NotificationManager;
+  }
+
   namespace System {
     class SystemTask;
   };
diff --git a/src/displayapp/LittleVgl.cpp b/src/displayapp/LittleVgl.cpp
index 3483f8e8..8a296c09 100644
--- a/src/displayapp/LittleVgl.cpp
+++ b/src/displayapp/LittleVgl.cpp
@@ -1,15 +1,11 @@
-#include <FreeRTOS.h>
-#include <projdefs.h>
-#include <task.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <hal/nrf_rtc.h>
-#include <libraries/log/nrf_log.h>
-
-#include <libs/lvgl/src/lv_themes/lv_theme.h>
-#include <libs/lvgl/src/lv_themes/lv_theme_night.h>
-
 #include "LittleVgl.h"
 
+#include <FreeRTOS.h>
+#include <task.h>
+//#include <projdefs.h>
+#include "drivers/Cst816s.h"
+#include "drivers/St7789.h"
+
 using namespace Pinetime::Components;
 
 extern "C" {
diff --git a/src/displayapp/LittleVgl.h b/src/displayapp/LittleVgl.h
index 5c1c4434..ea50985c 100644
--- a/src/displayapp/LittleVgl.h
+++ b/src/displayapp/LittleVgl.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_themes/lv_theme.h>
-#include <libs/lvgl/src/lv_hal/lv_hal.h>
-#include <drivers/St7789.h>
-#include <drivers/Cst816s.h>
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
+  namespace Drivers {
+    class Cst816S;
+    class St7789;
+  }
+
   namespace Components {
     class LittleVgl {
       public:
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 7eb97188..17026970 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -1,9 +1,10 @@
-#include <libs/lvgl/lvgl.h>
-#include <displayapp/DisplayApp.h>
-#include <functional>
 #include "ApplicationList.h"
-#include "Tile.h"
+#include <lvgl/lvgl.h>
+#include <array>
 #include "Symbols.h"
+#include "Tile.h"
+#include "displayapp/Apps.h"
+#include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index 9c95acb8..aefb2385 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -1,14 +1,9 @@
 #pragma once
 
-#include <functional>
-#include <vector>
+#include <memory>
 
-#include "components/ble/NimbleController.h"
 #include "Screen.h"
-#include "Label.h"
 #include "ScreenList.h"
-#include "Gauge.h"
-#include "Meter.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/BatteryIcon.cpp b/src/displayapp/screens/BatteryIcon.cpp
index 26939d18..4c102477 100644
--- a/src/displayapp/screens/BatteryIcon.cpp
+++ b/src/displayapp/screens/BatteryIcon.cpp
@@ -1,5 +1,6 @@
 #include "BatteryIcon.h"
 #include "Symbols.h"
+
 using namespace Pinetime::Applications::Screens;
 
 const char* BatteryIcon::GetBatteryIcon(float batteryPercent) {
diff --git a/src/displayapp/screens/BatteryIcon.h b/src/displayapp/screens/BatteryIcon.h
index 58f04a87..f1001923 100644
--- a/src/displayapp/screens/BatteryIcon.h
+++ b/src/displayapp/screens/BatteryIcon.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_draw/lv_img_decoder.h>
-
 namespace Pinetime {
   namespace Applications {
     namespace Screens {
diff --git a/src/displayapp/screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp
index 8ea9a771..c8085bed 100644
--- a/src/displayapp/screens/Brightness.cpp
+++ b/src/displayapp/screens/Brightness.cpp
@@ -1,5 +1,5 @@
-#include <libs/lvgl/lvgl.h>
 #include "Brightness.h"
+#include <lvgl/lvgl.h>
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/Brightness.h b/src/displayapp/screens/Brightness.h
index 7d599acf..7aee968e 100644
--- a/src/displayapp/screens/Brightness.h
+++ b/src/displayapp/screens/Brightness.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include "components/brightness/BrightnessController.h"
+#include <lvgl/src/lv_core/lv_obj.h>
+#include <cstdint>
 #include "Screen.h"
+#include "components/brightness/BrightnessController.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 977321c1..57659141 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -1,15 +1,16 @@
-#include <cstdio>
-
-#include <libs/date/includes/date/date.h>
-#include "components/datetime/DateTimeController.h"
-#include <libs/lvgl/lvgl.h>
 #include "Clock.h"
-#include "../DisplayApp.h"
+
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
 #include "BatteryIcon.h"
 #include "BleIcon.h"
-#include "Symbols.h"
-#include "components/ble/NotificationManager.h"
 #include "NotificationIcon.h"
+#include "Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 58149a79..4c5f60a0 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -1,17 +1,19 @@
 #pragma once
 
-#include <cstdint>
+#include <lvgl/src/lv_core/lv_obj.h>
 #include <chrono>
-
+#include <cstdint>
+#include <memory>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include "components/ble/NotificationManager.h"
-#include "components/battery/BatteryController.h"
-#include "components/ble/BleController.h"
+#include "components/datetime/DateTimeController.h"
 
 namespace Pinetime {
+  namespace Controllers {
+    class Battery;
+    class Ble;
+    class NotificationManager;
+  }
+
   namespace Applications {
     namespace Screens {
 
@@ -34,7 +36,7 @@ namespace Pinetime {
           T value;
           bool isUpdated = true;
       };
-      class Clock : public Screen{
+      class Clock : public Screen {
         public:
           Clock(DisplayApp* app,
                   Controllers::DateTime& dateTimeController,
diff --git a/src/displayapp/screens/DropDownDemo.cpp b/src/displayapp/screens/DropDownDemo.cpp
index ce3acd53..37728e17 100644
--- a/src/displayapp/screens/DropDownDemo.cpp
+++ b/src/displayapp/screens/DropDownDemo.cpp
@@ -1,6 +1,6 @@
-#include <libs/lvgl/lvgl.h>
-#include <libraries/log/nrf_log.h>
 #include "DropDownDemo.h"
+#include <lvgl/lvgl.h>
+#include <libraries/log/nrf_log.h>
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/DropDownDemo.h b/src/displayapp/screens/DropDownDemo.h
index 7c75efc0..d66aeed0 100644
--- a/src/displayapp/screens/DropDownDemo.h
+++ b/src/displayapp/screens/DropDownDemo.h
@@ -2,15 +2,13 @@
 
 #include <cstdint>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Applications {
     namespace Screens {
 
-      class DropDownDemo : public Screen{
+      class DropDownDemo : public Screen {
         public:
           DropDownDemo(DisplayApp* app);
           ~DropDownDemo() override;
diff --git a/src/displayapp/screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp
index 778409eb..b9f891d0 100644
--- a/src/displayapp/screens/FirmwareUpdate.cpp
+++ b/src/displayapp/screens/FirmwareUpdate.cpp
@@ -1,5 +1,6 @@
-#include <libs/lvgl/lvgl.h>
 #include "FirmwareUpdate.h"
+#include <lvgl/lvgl.h>
+#include "components/ble/BleController.h"
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index 893fe68c..262e7afb 100644
--- a/src/displayapp/screens/FirmwareUpdate.h
+++ b/src/displayapp/screens/FirmwareUpdate.h
@@ -1,15 +1,12 @@
 #pragma once
 
-#include <cstdint>
-#include <chrono>
-
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include "components/ble/BleController.h"
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
+  namespace Controllers {
+    class Ble;
+  }
   namespace Applications {
     namespace Screens {
 
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 4ac399ff..d4165dc5 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -1,8 +1,8 @@
-#include <libs/lvgl/lvgl.h>
 #include "FirmwareValidation.h"
-#include "../DisplayApp.h"
-#include "../../Version.h"
+#include <lvgl/lvgl.h>
+#include "Version.h"
 #include "components/firmwarevalidator/FirmwareValidator.h"
+#include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;
@@ -87,5 +87,3 @@ void FirmwareValidation::OnButtonEvent(lv_obj_t *object, lv_event_t event) {
   }
 
 }
-
-
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 947f5575..9eea86bd 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <cstdint>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/Gauge.cpp b/src/displayapp/screens/Gauge.cpp
index 81c283ca..1b9f2c6d 100644
--- a/src/displayapp/screens/Gauge.cpp
+++ b/src/displayapp/screens/Gauge.cpp
@@ -1,4 +1,3 @@
-#include <libs/lvgl/lvgl.h>
 #include "Gauge.h"
 #include "../DisplayApp.h"
 
diff --git a/src/displayapp/screens/Gauge.h b/src/displayapp/screens/Gauge.h
index 03c06bed..2a6b8f83 100644
--- a/src/displayapp/screens/Gauge.h
+++ b/src/displayapp/screens/Gauge.h
@@ -2,9 +2,7 @@
 
 #include <cstdint>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/lvgl.h>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 3ea75e9e..65be6622 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -1,7 +1,6 @@
-#include <libs/lvgl/lvgl.h>
-#include <libraries/log/nrf_log.h>
 #include "InfiniPaint.h"
 #include "../DisplayApp.h"
+#include "../LittleVgl.h"
 
 using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index f29135d5..9a7ac076 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -1,31 +1,30 @@
 #pragma once
 
+#include <lvgl/lvgl.h>
 #include <cstdint>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <drivers/St7789.h>
-#include "displayapp/LittleVgl.h"
 
 namespace Pinetime {
+  namespace Components {
+    class LittleVgl;
+  }
   namespace Applications {
     namespace Screens {
-      
+
       class InfiniPaint : public Screen {
       public:
         InfiniPaint(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
-        
+
         ~InfiniPaint() override;
-        
+
         bool Refresh() override;
-        
+
         bool OnButtonPushed() override;
-        
+
         bool OnTouchEvent(TouchEvents event) override;
-        
+
         bool OnTouchEvent(uint16_t x, uint16_t y) override;
-      
+
       private:
         Pinetime::Components::LittleVgl& lvgl;
         static constexpr uint16_t width = 10;
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp
index 540776cc..4be7742a 100644
--- a/src/displayapp/screens/Label.cpp
+++ b/src/displayapp/screens/Label.cpp
@@ -1,4 +1,3 @@
-#include <libs/lvgl/lvgl.h>
 #include "Label.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/Label.h b/src/displayapp/screens/Label.h
index 3e7b3797..dba89bbf 100644
--- a/src/displayapp/screens/Label.h
+++ b/src/displayapp/screens/Label.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <vector>
 #include "Screen.h"
 #include <lvgl/lvgl.h>
 
diff --git a/src/displayapp/screens/Meter.cpp b/src/displayapp/screens/Meter.cpp
index 273e111d..3c8e703c 100644
--- a/src/displayapp/screens/Meter.cpp
+++ b/src/displayapp/screens/Meter.cpp
@@ -1,5 +1,5 @@
-#include <libs/lvgl/lvgl.h>
 #include "Meter.h"
+#include <lvgl/lvgl.h>
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/Meter.h b/src/displayapp/screens/Meter.h
index ddf8be8d..86888dda 100644
--- a/src/displayapp/screens/Meter.h
+++ b/src/displayapp/screens/Meter.h
@@ -1,11 +1,9 @@
 #pragma once
 
 #include <cstdint>
-#include <chrono>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Modal.cpp b/src/displayapp/screens/Modal.cpp
index 29f7bfa7..d1a110ea 100644
--- a/src/displayapp/screens/Modal.cpp
+++ b/src/displayapp/screens/Modal.cpp
@@ -1,5 +1,5 @@
-#include <libs/lvgl/lvgl.h>
 #include "Modal.h"
+#include <lvgl/lvgl.h>
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/screens/Modal.h b/src/displayapp/screens/Modal.h
index c616c294..9cc177f0 100644
--- a/src/displayapp/screens/Modal.h
+++ b/src/displayapp/screens/Modal.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <cstdint>
-#include <chrono>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 225a15a4..c4ae3ac5 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -15,9 +15,13 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <libs/lvgl/lvgl.h>
-
 #include "Music.h"
+#include <cstdint>
+#include "../DisplayApp.h"
+#include "components/ble/MusicService.h"
+#include "displayapp/icons/music/disc.cpp"
+#include "displayapp/icons/music/disc_f_1.cpp"
+#include "displayapp/icons/music/disc_f_2.cpp"
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index 81ba7935..66bde21b 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -17,24 +17,16 @@
 */
 #pragma once
 
-#include <cstdint>
-#include <chrono>
+#include <FreeRTOS.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 #include <string>
-
-#include "components/gfx/Gfx.h"
-#include "components/battery/BatteryController.h"
-#include "components/ble/BleController.h"
-#include "components/ble/MusicService.h"
 #include "Screen.h"
-#include <bits/unique_ptr.h>
-#include <libs/lvgl/src/lv_core/lv_style.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include "../../Version.h"
-#include "displayapp/icons/music/disc.cpp"
-#include "displayapp/icons/music/disc_f_1.cpp"
-#include "displayapp/icons/music/disc_f_2.cpp"
 
 namespace Pinetime {
+  namespace Controllers {
+    class MusicService;
+  }
+
   namespace Applications {
     namespace Screens {
       class Music : public Screen {
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 85848b2f..51a601c4 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -1,7 +1,5 @@
-#include <libs/lvgl/lvgl.h>
-#include <displayapp/DisplayApp.h>
-#include <functional>
 #include "Notifications.h"
+#include <displayapp/DisplayApp.h>
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index fb4e1ef2..f5c6a860 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include <functional>
-#include <vector>
-
+#include <lvgl/lvgl.h>
+#include <cstdint>
+#include <memory>
 #include "Screen.h"
-#include "ScreenList.h"
-
+#include "components/ble/NotificationManager.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index b198634f..736e3634 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
+#include <array>
 #include <functional>
-#include "components/ble/NimbleController.h"
+#include <memory>
 #include "Screen.h"
-#include "Label.h"
+#include "../DisplayApp.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 867fdaeb..15bcfc5a 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -1,9 +1,13 @@
-#include <libs/lvgl/lvgl.h>
-#include <displayapp/DisplayApp.h>
-#include <functional>
 #include "SystemInfo.h"
-#include "../../Version.h"
-#include "Tile.h"
+#include <lvgl/lvgl.h>
+#include "../DisplayApp.h"
+#include "Label.h"
+#include "Version.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/datetime/DateTimeController.h"
+#include "drivers/Watchdog.h"
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/SystemInfo.h b/src/displayapp/screens/SystemInfo.h
index 987a584b..a71bacc5 100644
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -1,17 +1,24 @@
 #pragma once
 
-#include <functional>
-#include <vector>
-
-#include "components/ble/NimbleController.h"
+#include <memory>
 #include "Screen.h"
-#include "Label.h"
 #include "ScreenList.h"
-#include "Gauge.h"
-#include "Meter.h"
 
 namespace Pinetime {
+  namespace Controllers {
+    class DateTime;
+    class Battery;
+    class BrightnessController;
+    class Ble;
+  }
+
+  namespace Drivers {
+    class WatchdogView;
+  }
+
   namespace Applications {
+    class DisplayApp;
+
     namespace Screens {
       class SystemInfo : public Screen {
         public:
diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp
index 44b806c0..7d7697b9 100644
--- a/src/displayapp/screens/Tab.cpp
+++ b/src/displayapp/screens/Tab.cpp
@@ -1,14 +1,11 @@
-#include <cstdio>
-#include <libs/date/includes/date/date.h>
-#include "components/datetime/DateTimeController.h"
-#include <Version.h>
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <libs/lvgl/src/lv_font/lv_font.h>
-#include <libs/lvgl/lvgl.h>
-#include <libraries/log/nrf_log.h>
 #include "Tab.h"
-#include "displayapp/DisplayApp.h"
-
+#include <Version.h>
+#include <libraries/log/nrf_log.h>
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include "../DisplayApp.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/gfx/Gfx.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -19,7 +16,7 @@ extern lv_font_t jetbrains_mono_bold_20;
 //  screen->OnObjectEvent(obj, event);
 //}
 
-Tab::Tab(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app, gfx) {
+Tab::Tab(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app), gfx(gfx) {
 /*Create a Tab view object*/
   lv_obj_t *tabview;
   tabview = lv_tabview_create(lv_scr_act(), NULL);
diff --git a/src/displayapp/screens/Tab.h b/src/displayapp/screens/Tab.h
index e16dbb96..10661295 100644
--- a/src/displayapp/screens/Tab.h
+++ b/src/displayapp/screens/Tab.h
@@ -1,22 +1,24 @@
 #pragma once
 
-#include <cstdint>
 #include "Screen.h"
-#include <bits/unique_ptr.h>
 #include <lvgl/src/lv_core/lv_style.h>
+#include <lvgl/src/lv_core/lv_obj.h>
 
 namespace Pinetime {
+  namespace Components {
+    class Gfx;
+  }
   namespace Applications {
     namespace Screens {
       class Tab : public Screen {
         public:
           explicit Tab(DisplayApp* app, Components::Gfx& gfx);
           ~Tab() override;
-          void Refresh(bool fullRefresh) override;
+          void Refresh(bool fullRefresh);
           void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
 
-        private:
-
+        protected:
+          Components::Gfx& gfx;
       };
     }
   }
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 75fa6ef5..c1a5e94f 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -1,11 +1,5 @@
-#include <libs/lvgl/src/lv_core/lv_obj.h>
-#include <libs/lvgl/src/lv_font/lv_font.h>
-#include <libs/lvgl/lvgl.h>
-
 #include "Tile.h"
-#include "displayapp/DisplayApp.h"
-#include "Symbols.h"
-#include "../../Version.h"
+#include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
 
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index cf5fcf15..7edf67b2 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <lvgl/lvgl.h>
 #include <cstdint>
-#include "Screen.h"
-#include <bits/unique_ptr.h>
+#include <memory>
 #include "Modal.h"
-#include <lvgl/src/lv_core/lv_style.h>
-#include <displayapp/Apps.h>
+#include "Screen.h"
+#include "../Apps.h"
 
 namespace Pinetime {
   namespace Applications {

From f42b33ed6d3db56fd61450c4c47b5c6c597d3227 Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Sun, 15 Nov 2020 17:45:43 +0100
Subject: [PATCH 4/5] fix TWI includes

---
 src/drivers/TwiMaster.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/drivers/TwiMaster.h b/src/drivers/TwiMaster.h
index cc0b6f02..399e3d0f 100644
--- a/src/drivers/TwiMaster.h
+++ b/src/drivers/TwiMaster.h
@@ -1,6 +1,8 @@
 #pragma once
 #include <FreeRTOS.h>
 #include <semphr.h>
+#include <drivers/include/nrfx_twi.h> // NRF_TWIM_Type
+#include <cstdint>
 
 namespace Pinetime {
   namespace Drivers {

From 6e22509b5ffe6d7c29d09b07f38e64fb1bdc0b21 Mon Sep 17 00:00:00 2001
From: okaestne <git@oliver-kaestner.de>
Date: Tue, 17 Nov 2020 20:51:27 +0100
Subject: [PATCH 5/5] Delete Tab.cpp and Tab.h

as discussed with JF
---
 src/displayapp/screens/Tab.cpp | 64 ----------------------------------
 src/displayapp/screens/Tab.h   | 25 -------------
 2 files changed, 89 deletions(-)
 delete mode 100644 src/displayapp/screens/Tab.cpp
 delete mode 100644 src/displayapp/screens/Tab.h

diff --git a/src/displayapp/screens/Tab.cpp b/src/displayapp/screens/Tab.cpp
deleted file mode 100644
index 7d7697b9..00000000
--- a/src/displayapp/screens/Tab.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "Tab.h"
-#include <Version.h>
-#include <libraries/log/nrf_log.h>
-#include <date/date.h>
-#include <lvgl/lvgl.h>
-#include "../DisplayApp.h"
-#include "components/datetime/DateTimeController.h"
-#include "components/gfx/Gfx.h"
-
-using namespace Pinetime::Applications::Screens;
-
-extern lv_font_t jetbrains_mono_bold_20;
-
-//static void event_handler(lv_obj_t * obj, lv_event_t event) {
-//  Tile* screen = static_cast<Tile *>(obj->user_data);
-//  screen->OnObjectEvent(obj, event);
-//}
-
-Tab::Tab(DisplayApp* app, Pinetime::Components::Gfx &gfx) : Screen(app), gfx(gfx) {
-/*Create a Tab view object*/
-  lv_obj_t *tabview;
-  tabview = lv_tabview_create(lv_scr_act(), NULL);
-
-  /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/
-  lv_obj_t *tab1 = lv_tabview_add_tab(tabview, "Tab 1");
-  lv_obj_t *tab2 = lv_tabview_add_tab(tabview, "Tab 2");
-  lv_obj_t *tab3 = lv_tabview_add_tab(tabview, "Tab 3");
-
-
-  /*Add content to the tabs*/
-  lv_obj_t * label = lv_label_create(tab1, NULL);
-  lv_label_set_text(label, "This the first tab\n\n"
-                           "If the content\n"
-                           "of a tab\n"
-                           "become too long\n"
-                           "the it \n"
-                           "automatically\n"
-                           "become\n"
-                           "scrollable.");
-
-  label = lv_label_create(tab2, NULL);
-  lv_label_set_text(label, "Second tab");
-
-  label = lv_label_create(tab3, NULL);
-  lv_label_set_text(label, "Third tab");
-
-}
-
-Tab::~Tab() {
-  lv_obj_clean(lv_scr_act());
-}
-
-void Tab::Refresh(bool fullRefresh) {
-
-}
-
-void Tab::OnObjectEvent(lv_obj_t *obj, lv_event_t event) {
-  if(event == LV_EVENT_CLICKED) {
-    NRF_LOG_INFO("Clicked");
-  }
-  else if(event == LV_EVENT_VALUE_CHANGED) {
-    NRF_LOG_INFO("Toggled");
-  }
-}
diff --git a/src/displayapp/screens/Tab.h b/src/displayapp/screens/Tab.h
deleted file mode 100644
index 10661295..00000000
--- a/src/displayapp/screens/Tab.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Screen.h"
-#include <lvgl/src/lv_core/lv_style.h>
-#include <lvgl/src/lv_core/lv_obj.h>
-
-namespace Pinetime {
-  namespace Components {
-    class Gfx;
-  }
-  namespace Applications {
-    namespace Screens {
-      class Tab : public Screen {
-        public:
-          explicit Tab(DisplayApp* app, Components::Gfx& gfx);
-          ~Tab() override;
-          void Refresh(bool fullRefresh);
-          void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
-
-        protected:
-          Components::Gfx& gfx;
-      };
-    }
-  }
-}