From 0b9bca2a05007763e63dcb40a559f07700f534d2 Mon Sep 17 00:00:00 2001
From: Alek Rudnik <aleksander.rudnik@mudita.com>
Date: Wed, 3 Mar 2021 15:51:37 +0100
Subject: [PATCH] [EGD-6014] Fix top bar includes

This is only clean up of includes, no functional changes
---
 module-apps/application-calendar/widgets/DayLabel.cpp         | 1 +
 .../application-calendar/widgets/RepeatAndReminderItem.cpp    | 1 +
 module-apps/application-calendar/windows/DayEventsWindow.cpp  | 1 +
 module-apps/application-calendar/windows/DayEventsWindow.hpp  | 2 ++
 .../application-calendar/windows/EventReminderWindow.cpp      | 1 +
 .../application-calendar/windows/EventReminderWindow.hpp      | 2 ++
 .../application-calllog/windows/CallLogDetailsWindow.hpp      | 1 -
 module-apps/application-calllog/windows/CallLogMainWindow.hpp | 1 -
 module-apps/application-desktop/windows/DeadBatteryWindow.cpp | 3 +++
 module-apps/application-desktop/windows/DeadBatteryWindow.hpp | 1 +
 module-apps/application-desktop/windows/MenuWindow.cpp        | 1 +
 module-apps/application-desktop/windows/MenuWindow.hpp        | 2 +-
 module-apps/application-desktop/windows/MmiPushWindow.cpp     | 1 +
 module-apps/application-desktop/windows/MmiPushWindow.hpp     | 1 +
 module-apps/application-desktop/windows/PinLockBaseWindow.cpp | 1 +
 module-apps/application-desktop/windows/PinLockBaseWindow.hpp | 1 +
 module-apps/application-desktop/windows/PinLockWindow.hpp     | 1 -
 module-apps/application-desktop/windows/SimLockBox.cpp        | 1 +
 module-apps/application-settings-new/ApplicationSettings.hpp  | 1 +
 .../application-settings-new/windows/AllDevicesWindow.cpp     | 1 +
 .../application-settings-new/windows/AllDevicesWindow.hpp     | 2 ++
 .../windows/BluetoothCheckPasskeyWindow.cpp                   | 1 +
 module-apps/application-settings/ApplicationSettings.hpp      | 1 +
 module-apps/application-settings/windows/ColorTestWindow.hpp  | 1 -
 module-apps/application-settings/windows/DateTimeWindow.hpp   | 1 -
 module-apps/application-settings/windows/EinkModeWindow.hpp   | 1 -
 module-apps/application-settings/windows/LanguageWindow.hpp   | 1 -
 .../application-settings/windows/TestMessageWindow.hpp        | 1 -
 module-apps/options/type/OptionSetting.cpp                    | 1 +
 module-apps/options/type/OptionSimple.cpp                     | 1 +
 module-apps/windows/Dialog.cpp                                | 1 +
 module-apps/windows/Dialog.hpp                                | 2 ++
 module-apps/windows/NoEvents.cpp                              | 1 +
 module-apps/windows/NoEvents.hpp                              | 2 ++
 module-gui/gui/widgets/TopBar.hpp                             | 4 ++--
 35 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/module-apps/application-calendar/widgets/DayLabel.cpp b/module-apps/application-calendar/widgets/DayLabel.cpp
index 9ef1349b4931d76c0f75372f1ee38480cb71db2f..bc7360ec172667e65ecfe24c712e7b2ad7d651f6 100644
--- a/module-apps/application-calendar/widgets/DayLabel.cpp
+++ b/module-apps/application-calendar/widgets/DayLabel.cpp
@@ -7,6 +7,7 @@
 #include "application-calendar/widgets/MonthBox.hpp"
 #include "application-calendar/data/CalendarData.hpp"
 #include <time/time_conversion.hpp>
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp b/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp
index d8b437a487f6ba134c60350051064deb9804ad57..7f39696c9cefa788e78770edc3b46fa9deaf8653 100644
--- a/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp
+++ b/module-apps/application-calendar/widgets/RepeatAndReminderItem.cpp
@@ -7,6 +7,7 @@
 #include "application-alarm-clock/data/AlarmsData.hpp"
 #include <Style.hpp>
 #include <Utils.hpp>
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/windows/DayEventsWindow.cpp b/module-apps/application-calendar/windows/DayEventsWindow.cpp
index d8e4749d83cab012bbc2d2698dd1cca9dd73bae7..1209583cb1f1768c94c94442458b17136dbc5ba4 100644
--- a/module-apps/application-calendar/windows/DayEventsWindow.cpp
+++ b/module-apps/application-calendar/windows/DayEventsWindow.cpp
@@ -7,6 +7,7 @@
 #include <gui/widgets/Window.hpp>
 #include <gui/widgets/Label.hpp>
 #include <gui/widgets/Item.hpp>
+#include <gui/widgets/Image.hpp>
 #include <gui/widgets/BottomBar.hpp>
 #include <gui/widgets/TopBar.hpp>
 
diff --git a/module-apps/application-calendar/windows/DayEventsWindow.hpp b/module-apps/application-calendar/windows/DayEventsWindow.hpp
index cc5450b4f21cd4837d4ea041ae53dcce64287230..994f2a325ecbf1eb12100a89f33c422a3f578c55 100644
--- a/module-apps/application-calendar/windows/DayEventsWindow.hpp
+++ b/module-apps/application-calendar/windows/DayEventsWindow.hpp
@@ -16,6 +16,8 @@
 
 namespace gui
 {
+    class Image;
+
     class DayEventsWindow : public gui::AppWindow
     {
         std::string dayMonthTitle;
diff --git a/module-apps/application-calendar/windows/EventReminderWindow.cpp b/module-apps/application-calendar/windows/EventReminderWindow.cpp
index 2ec298f00bd2668e92ff36ccc3dcfcf1da1e8f54..de8311bf1fa82b245348f8a4afe4ba0b5d6ec5bf 100644
--- a/module-apps/application-calendar/windows/EventReminderWindow.cpp
+++ b/module-apps/application-calendar/windows/EventReminderWindow.cpp
@@ -7,6 +7,7 @@
 #include <gui/widgets/Window.hpp>
 #include <time/time_conversion.hpp>
 #include "service-appmgr/Controller.hpp"
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-calendar/windows/EventReminderWindow.hpp b/module-apps/application-calendar/windows/EventReminderWindow.hpp
index 3cf03aba122ea6ff94fe285d056446919b4f9f53..831aa627fd893a14b34511c22882e717b81ed56b 100644
--- a/module-apps/application-calendar/windows/EventReminderWindow.hpp
+++ b/module-apps/application-calendar/windows/EventReminderWindow.hpp
@@ -13,6 +13,8 @@
 
 namespace gui
 {
+    class Image;
+
     class EventReminderWindow : public gui::AppWindow
     {
       private:
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
index bf24ec468916984186175b8975cdc871776cd4be..d290cd74f40a6585e368b5a1b2325717e7ef5493 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
@@ -12,7 +12,6 @@
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Window.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 #include "gui/widgets/ListView.hpp"
 
 #include "../data/CallLogInternals.hpp"
diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.hpp b/module-apps/application-calllog/windows/CallLogMainWindow.hpp
index a0c8dcc0895f79b9ce03b626a80847163a3acdea..ef9f07fcd4c32fcd44327bd712b0246a6f37491f 100644
--- a/module-apps/application-calllog/windows/CallLogMainWindow.hpp
+++ b/module-apps/application-calllog/windows/CallLogMainWindow.hpp
@@ -11,7 +11,6 @@
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Window.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 #include "gui/widgets/ListView.hpp"
 
 #include "../CalllogModel.hpp"
diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
index cca27e0ccd4518c584965f81860e5da4181d7bb2..0df75fec8ad5b8d8ebf86631fb77dd6ea51443d3 100644
--- a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
@@ -8,6 +8,9 @@
 #include "gui/widgets/TopBar.hpp"
 #include "log/log.hpp"
 #include <application-desktop/windows/Names.hpp>
+#include <service-appmgr/model/ApplicationManager.hpp>
+#include <service-appmgr/Controller.hpp>
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.hpp b/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
index 9495adf10724bbcbfe5243dffb922f89ad1887fa..037c0d482e4112e55b2ec6a97b42562c6b3c9734 100644
--- a/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
+++ b/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
@@ -8,6 +8,7 @@
 
 namespace gui
 {
+    class Image;
     class DeadBatteryWindow : public AppWindow
     {
       public:
diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp
index 7d019d2f7a83bda7580a594405ed94ee7c8c6f9a..defb6c0cb98226ff389c8d50777e64d35abef58b 100644
--- a/module-apps/application-desktop/windows/MenuWindow.cpp
+++ b/module-apps/application-desktop/windows/MenuWindow.cpp
@@ -12,6 +12,7 @@
 #include <Style.hpp>
 #include <cassert>
 #include <i18n/i18n.hpp>
+#include <Image.hpp>
 
 namespace style::design
 {
diff --git a/module-apps/application-desktop/windows/MenuWindow.hpp b/module-apps/application-desktop/windows/MenuWindow.hpp
index 7f3f39c782054dd9a5f27474433cebc722d06f32..fe251ec91625ec008e541b8865ec9a495aa4f963 100644
--- a/module-apps/application-desktop/windows/MenuWindow.hpp
+++ b/module-apps/application-desktop/windows/MenuWindow.hpp
@@ -10,12 +10,12 @@
 #include "widgets/BottomBar.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/Rect.hpp"
-#include "widgets/TopBar.hpp"
 
 #include "utf8/UTF8.hpp"
 
 namespace gui
 {
+    class Image;
     /// icon, description, name of application to run
     struct Tile : public Rect
     {
diff --git a/module-apps/application-desktop/windows/MmiPushWindow.cpp b/module-apps/application-desktop/windows/MmiPushWindow.cpp
index 27b097745348c1d23ed5c8a3d8d6f70ac5bd202d..a936583b81a0637e41d4d2e2407ced2f57d31f7a 100644
--- a/module-apps/application-desktop/windows/MmiPushWindow.cpp
+++ b/module-apps/application-desktop/windows/MmiPushWindow.cpp
@@ -6,6 +6,7 @@
 #include <service-appmgr/data/MmiActionsParams.hpp>
 #include <application-desktop/data/Mmi.hpp>
 #include <i18n/i18n.hpp>
+#include <Image.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/application-desktop/windows/MmiPushWindow.hpp b/module-apps/application-desktop/windows/MmiPushWindow.hpp
index 942eb7f4ecaf9cc423a4dbd2761acc7f689ccfd9..390e2fada73870390e68d8ef69a7846b80729328 100644
--- a/module-apps/application-desktop/windows/MmiPushWindow.hpp
+++ b/module-apps/application-desktop/windows/MmiPushWindow.hpp
@@ -10,6 +10,7 @@
 
 namespace gui
 {
+    class Image;
     class MmiPushWindow : public AppWindow
     {
       protected:
diff --git a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
index 36da329ec4864c1222ee7d95cebf3994a3039d6b..03ca6ec907d71af87dbe647a8d10dfa4f454a3bd 100644
--- a/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
+++ b/module-apps/application-desktop/windows/PinLockBaseWindow.cpp
@@ -5,6 +5,7 @@
 #include "application-desktop/widgets/PinLock.hpp"
 #include <i18n/i18n.hpp>
 #include "PinLockBaseWindow.hpp"
+#include <Image.hpp>
 
 namespace lock_style = style::window::pin_lock;
 
diff --git a/module-apps/application-desktop/windows/PinLockBaseWindow.hpp b/module-apps/application-desktop/windows/PinLockBaseWindow.hpp
index 2bad2e8ddd567703eb637f44ddf16be341c5b960..527e18759a7954d1bd434fb5d782330c48224d90 100644
--- a/module-apps/application-desktop/windows/PinLockBaseWindow.hpp
+++ b/module-apps/application-desktop/windows/PinLockBaseWindow.hpp
@@ -7,6 +7,7 @@
 
 namespace gui
 {
+    class Image;
     class PinLockBaseWindow : public LockWindow
     {
       public:
diff --git a/module-apps/application-desktop/windows/PinLockWindow.hpp b/module-apps/application-desktop/windows/PinLockWindow.hpp
index 897956d656ab92657432f9a547893ff8ed6a5c30..12ce3be0fb506936c9323c983e9a58c1cdda3d95 100644
--- a/module-apps/application-desktop/windows/PinLockWindow.hpp
+++ b/module-apps/application-desktop/windows/PinLockWindow.hpp
@@ -7,7 +7,6 @@
 #include "gui/widgets/Label.hpp"
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 #include "application-desktop/widgets/PinLock.hpp"
 #include "PinLockBox.hpp"
 #include "PinLockBaseWindow.hpp"
diff --git a/module-apps/application-desktop/windows/SimLockBox.cpp b/module-apps/application-desktop/windows/SimLockBox.cpp
index f8dabf439f751a01a5861799041f18f1012dff20..dbd6f0e9a4514eef9628b6a7366ea4a1229e41ce 100644
--- a/module-apps/application-desktop/windows/SimLockBox.cpp
+++ b/module-apps/application-desktop/windows/SimLockBox.cpp
@@ -7,6 +7,7 @@
 #include "application-desktop/widgets/PinLock.hpp"
 #include "application-desktop/data/AppDesktopStyle.hpp"
 #include <Style.hpp>
+#include <Image.hpp>
 
 namespace label_style = style::window::pin_lock::pin_label;
 
diff --git a/module-apps/application-settings-new/ApplicationSettings.hpp b/module-apps/application-settings-new/ApplicationSettings.hpp
index 95d388c416197d0f26fcbde8ea8d06480a36719f..46b0460d1a8704ce47a5c394244c12648b06f21b 100644
--- a/module-apps/application-settings-new/ApplicationSettings.hpp
+++ b/module-apps/application-settings-new/ApplicationSettings.hpp
@@ -7,6 +7,7 @@
 
 #include <bsp/common.hpp>
 #include <module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp>
+#include <common_data/EventStore.hpp>
 
 namespace gui::window::name
 {
diff --git a/module-apps/application-settings-new/windows/AllDevicesWindow.cpp b/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
index e855307a2b9112992428dc098bad0aba9233a8eb..b3f16875b11197d50876c56aef16792d4bd3ad80 100644
--- a/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
+++ b/module-apps/application-settings-new/windows/AllDevicesWindow.cpp
@@ -10,6 +10,7 @@
 #include "OptionSetting.hpp"
 
 #include <InputEvent.hpp>
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings-new/windows/AllDevicesWindow.hpp b/module-apps/application-settings-new/windows/AllDevicesWindow.hpp
index 9196c0be8e89c437df8e5d21a32ecf082a2034c6..5f59d52d7095da61d88de6f4746539198ce712ee 100644
--- a/module-apps/application-settings-new/windows/AllDevicesWindow.hpp
+++ b/module-apps/application-settings-new/windows/AllDevicesWindow.hpp
@@ -9,6 +9,8 @@
 
 namespace gui
 {
+    class Image;
+
     class AllDevicesWindow : public BaseSettingsWindow
     {
       public:
diff --git a/module-apps/application-settings-new/windows/BluetoothCheckPasskeyWindow.cpp b/module-apps/application-settings-new/windows/BluetoothCheckPasskeyWindow.cpp
index 59303c3c581afe46eefa5d7606d4512d642bb390..b50461a07a06de3cbc075aa2aaf53d2c2a47c113 100644
--- a/module-apps/application-settings-new/windows/BluetoothCheckPasskeyWindow.cpp
+++ b/module-apps/application-settings-new/windows/BluetoothCheckPasskeyWindow.cpp
@@ -5,6 +5,7 @@
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "application-settings-new/widgets/SettingsStyle.hpp"
 #include <widgets/Text.hpp>
+#include <Image.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/ApplicationSettings.hpp b/module-apps/application-settings/ApplicationSettings.hpp
index b70689e933e1f024679d5302b13995a79edadcde..089af884173445e2ef1c51607f7c12d86aa9ba61 100644
--- a/module-apps/application-settings/ApplicationSettings.hpp
+++ b/module-apps/application-settings/ApplicationSettings.hpp
@@ -6,6 +6,7 @@
 
 #include "Application.hpp"
 #include "bsp/common.hpp"
+#include <common_data/EventStore.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-settings/windows/ColorTestWindow.hpp b/module-apps/application-settings/windows/ColorTestWindow.hpp
index d0f9c58b41965213c767a4be7d823f59e661e1c2..607f03f0aac7949ff2104e6a035c8015c056ea7c 100644
--- a/module-apps/application-settings/windows/ColorTestWindow.hpp
+++ b/module-apps/application-settings/windows/ColorTestWindow.hpp
@@ -14,7 +14,6 @@
 #include <gui/widgets/Image.hpp>
 #include <gui/widgets/Window.hpp>
 #include <gui/widgets/BottomBar.hpp>
-#include <gui/widgets/TopBar.hpp>
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/DateTimeWindow.hpp b/module-apps/application-settings/windows/DateTimeWindow.hpp
index ce2251f1a50660048cc8348f49ecf917dee2e11c..0297159e2725f18eeffe9db1c10a2ed3d5e2458e 100644
--- a/module-apps/application-settings/windows/DateTimeWindow.hpp
+++ b/module-apps/application-settings/windows/DateTimeWindow.hpp
@@ -17,7 +17,6 @@
 #include "gui/widgets/BottomBar.hpp"
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Label.hpp"
-#include "gui/widgets/TopBar.hpp"
 #include "gui/widgets/Window.hpp"
 #include <widgets/BoxLayout.hpp>
 
diff --git a/module-apps/application-settings/windows/EinkModeWindow.hpp b/module-apps/application-settings/windows/EinkModeWindow.hpp
index 8c21464008e1f3fe24c1620855a0e3806643af47..eb6ce6be4f457ac309e64a9b0a5e25cb36fb01f0 100644
--- a/module-apps/application-settings/windows/EinkModeWindow.hpp
+++ b/module-apps/application-settings/windows/EinkModeWindow.hpp
@@ -9,7 +9,6 @@
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Window.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/LanguageWindow.hpp b/module-apps/application-settings/windows/LanguageWindow.hpp
index a33fade0fbe92da9ae6330493914ac67aabfed09..89b4bd8da7c565443d1b14982d2cbaed0f148c5e 100644
--- a/module-apps/application-settings/windows/LanguageWindow.hpp
+++ b/module-apps/application-settings/windows/LanguageWindow.hpp
@@ -12,7 +12,6 @@
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Window.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 
 namespace gui
 {
diff --git a/module-apps/application-settings/windows/TestMessageWindow.hpp b/module-apps/application-settings/windows/TestMessageWindow.hpp
index b362710aee2bb12ec09f8bf0c82783d47ec70c51..68606137477be2cc11d753aab07bbeef66e28d84 100644
--- a/module-apps/application-settings/windows/TestMessageWindow.hpp
+++ b/module-apps/application-settings/windows/TestMessageWindow.hpp
@@ -20,7 +20,6 @@
 #include "gui/widgets/Image.hpp"
 #include "gui/widgets/Window.hpp"
 #include "gui/widgets/BottomBar.hpp"
-#include "gui/widgets/TopBar.hpp"
 
 namespace gui
 {
diff --git a/module-apps/options/type/OptionSetting.cpp b/module-apps/options/type/OptionSetting.cpp
index 02ffb8b913eafed9b9d74e9c84c8975d2effa461..31b14995982519e290aec23bf0ce2fb76901509f 100644
--- a/module-apps/options/type/OptionSetting.cpp
+++ b/module-apps/options/type/OptionSetting.cpp
@@ -4,6 +4,7 @@
 #include <TextFixedSize.hpp>
 #include "OptionSetting.hpp"
 #include "widgets/ButtonOnOff.hpp"
+#include <Image.hpp>
 
 namespace gui::option
 {
diff --git a/module-apps/options/type/OptionSimple.cpp b/module-apps/options/type/OptionSimple.cpp
index 05e95dc2093ccb9589119d1bd5a9cb083c1a5d14..4be4bffb14a52a4d1f1558096629bf434664a5c3 100644
--- a/module-apps/options/type/OptionSimple.cpp
+++ b/module-apps/options/type/OptionSimple.cpp
@@ -6,6 +6,7 @@
 #include "FontManager.hpp"
 #include "Text.hpp"
 #include "TextFixedSize.hpp"
+#include <Image.hpp>
 
 namespace gui::option
 {
diff --git a/module-apps/windows/Dialog.cpp b/module-apps/windows/Dialog.cpp
index b35b4d8990232f55386085f81910a7215c0b1909..073710642c369cbc506376be00fe04ba9a4a6c7f 100644
--- a/module-apps/windows/Dialog.cpp
+++ b/module-apps/windows/Dialog.cpp
@@ -5,6 +5,7 @@
 #include "DialogMetadataMessage.hpp"
 #include <service-appmgr/model/ApplicationManager.hpp>
 #include <i18n/i18n.hpp>
+#include <Image.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/windows/Dialog.hpp b/module-apps/windows/Dialog.hpp
index 489a31943bd000133e14dd9ab13c68dbc09872e9..f35874fc93bcd963dad016c2e4430825e8d0e6a3 100644
--- a/module-apps/windows/Dialog.hpp
+++ b/module-apps/windows/Dialog.hpp
@@ -16,6 +16,8 @@ namespace gui::window::name
 
 namespace gui
 {
+    class Image;
+
     /// @brief base Dialog class
     ///
     /// Contain icon, text and Back action
diff --git a/module-apps/windows/NoEvents.cpp b/module-apps/windows/NoEvents.cpp
index cc758f8499bb66ccb3e048b3921ae0a2ce8635b6..7882e0d6cbe5f80ba454235a75d275d14f307512 100644
--- a/module-apps/windows/NoEvents.cpp
+++ b/module-apps/windows/NoEvents.cpp
@@ -7,6 +7,7 @@
 #include "log/log.hpp"
 
 #include <service-appmgr/Controller.hpp>
+#include <Image.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/windows/NoEvents.hpp b/module-apps/windows/NoEvents.hpp
index 66ac34ce1eef9b4d2902188bc37cadbeec5f864a..a2194539246fa75c26fce98c585cf430e1983896 100644
--- a/module-apps/windows/NoEvents.hpp
+++ b/module-apps/windows/NoEvents.hpp
@@ -16,6 +16,8 @@ enum class EquivalentWindow
 
 namespace gui
 {
+    class Image;
+
     class NoEvents : public Dialog
     {
         gui::Image *arrow = nullptr;
diff --git a/module-gui/gui/widgets/TopBar.hpp b/module-gui/gui/widgets/TopBar.hpp
index 21418c8a823fb7825da8ccabc987fc4572f3f1fe..4306f13e7c9bcba2c261ae1f130051adf9fe1205 100644
--- a/module-gui/gui/widgets/TopBar.hpp
+++ b/module-gui/gui/widgets/TopBar.hpp
@@ -4,14 +4,14 @@
 #pragma once
 
 #include <Rect.hpp>
-#include <Image.hpp>
-#include <common_data/EventStore.hpp>
 #include <vector>
 #include <map>
 
 namespace gui
 {
     class Label;
+    class Image;
+
     namespace top_bar
     {
         class SignalStrengthBase;