From d5de12f7cea071555de4058ebf62b160a86a36af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Wicik?=
 <60609724+rwicik@users.noreply.github.com>
Date: Wed, 28 Oct 2020 15:19:24 +0100
Subject: [PATCH] [EGD-3852] clean include in service (#928)

---
 .../service-antenna/ServiceAntenna.cpp        |  33 ++---
 .../service-antenna/ServiceAntenna.hpp        |  23 +++-
 .../service-antenna/api/AntennaServiceAPI.cpp |  17 ++-
 .../service-antenna/api/AntennaServiceAPI.hpp |   7 +-
 .../service-appmgr/ApplicationManager.cpp     |  38 +++---
 .../service-appmgr/ApplicationManager.hpp     |  29 ++++-
 module-services/service-appmgr/Controller.cpp |   6 +-
 module-services/service-appmgr/Controller.hpp |  12 +-
 .../service-audio/api/AudioServiceAPI.cpp     |  16 ++-
 .../service-audio/api/AudioServiceAPI.hpp     |  17 ++-
 .../service-bluetooth/ServiceBluetooth.cpp    |  21 +--
 .../service-bluetooth/ServiceBluetooth.hpp    |   9 +-
 .../service-cellular/CellularCall.cpp         |  22 ++--
 .../service-cellular/CellularCall.hpp         |  17 ++-
 .../service-cellular/ServiceCellular.cpp      | 120 ++++++++++--------
 .../service-cellular/ServiceCellular.hpp      |  40 ++++--
 .../service-cellular/SignalStrength.hpp       |   3 +-
 .../api/CellularServiceAPI.cpp                |  26 ++--
 .../api/CellularServiceAPI.hpp                |  15 ++-
 module-services/service-db/ServiceDB.cpp      |  70 +++++++---
 module-services/service-db/ServiceDB.hpp      |  34 ++++-
 .../service-db/agents/DatabaseAgent.cpp       |   5 +
 .../service-db/agents/DatabaseAgent.hpp       |  10 +-
 .../service-db/agents/settings/Settings.cpp   |  13 +-
 .../service-db/agents/settings/Settings.hpp   |  16 ++-
 .../agents/settings/SettingsAgent.cpp         |  15 ++-
 .../agents/settings/SettingsAgent.hpp         |  15 ++-
 .../service-db/api/DBServiceAPI.cpp           |  62 +++++----
 .../service-db/api/DBServiceAPI.hpp           |  39 ++++--
 .../api/DBServiceAPI_GetByQuery.cpp           |  22 +++-
 .../service-db/messages/DBAlarmMessage.cpp    |   5 +
 .../service-db/messages/DBAlarmMessage.hpp    |  10 +-
 .../service-db/messages/DBCalllogMessage.cpp  |   5 +
 .../service-db/messages/DBCalllogMessage.hpp  |  10 +-
 .../service-db/messages/DBContactMessage.cpp  |  10 +-
 .../service-db/messages/DBContactMessage.hpp  |  19 +--
 .../messages/DBCountryCodeMessage.cpp         |   2 +
 .../messages/DBCountryCodeMessage.hpp         |   6 +-
 .../service-db/messages/DBNotesMessage.cpp    |   5 +
 .../service-db/messages/DBNotesMessage.hpp    |   9 +-
 .../messages/DBNotificationMessage.cpp        |   4 +
 .../messages/DBNotificationMessage.hpp        |   9 +-
 .../service-db/messages/DBSMSMessage.cpp      |   5 +
 .../service-db/messages/DBSMSMessage.hpp      |   9 +-
 .../messages/DBSMSTemplateMessage.cpp         |   5 +
 .../messages/DBSMSTemplateMessage.hpp         |   9 +-
 .../service-db/messages/DBServiceMessage.cpp  |   2 +
 .../service-db/messages/DBServiceMessage.hpp  |   6 +-
 .../service-db/messages/DBSettingsMessage.cpp |   5 +
 .../service-db/messages/DBSettingsMessage.hpp |  10 +-
 .../service-db/messages/DBThreadMessage.cpp   |   5 +
 .../service-db/messages/DBThreadMessage.hpp   |  10 +-
 .../service-db/messages/QueryMessage.cpp      |  10 +-
 .../service-db/test/test-service-db-api.cpp   |   9 +-
 .../test/test-service-db-settings-api.cpp     |  18 ++-
 .../test-service-db-settings-messages.cpp     |  21 +--
 .../service-desktop/ServiceDesktop.cpp        |  26 +++-
 .../service-desktop/ServiceDesktop.hpp        |   9 ++
 .../service-desktop/WorkerDesktop.cpp         |  11 +-
 .../service-desktop/WorkerDesktop.hpp         |  13 +-
 .../endpoints/backup/BackupEndpoint.cpp       |  16 ++-
 .../endpoints/backup/BackupEndpoint.hpp       |  16 ++-
 .../endpoints/backup/BackupRestore.cpp        |  24 +++-
 .../endpoints/backup/BackupRestore.hpp        |   5 +
 .../endpoints/calllog/CalllogEndpoint.cpp     |   2 +
 .../endpoints/calllog/CalllogEndpoint.hpp     |  17 ++-
 .../endpoints/calllog/CalllogHelper.cpp       |  21 ++-
 .../endpoints/calllog/CalllogHelper.hpp       |  19 ++-
 .../endpoints/contacts/ContactHelper.cpp      |  35 +++--
 .../endpoints/contacts/ContactHelper.hpp      |  19 ++-
 .../endpoints/contacts/ContactsEndpoint.cpp   |   8 +-
 .../endpoints/contacts/ContactsEndpoint.hpp   |  17 ++-
 .../developerMode/DeveloperModeEndpoint.cpp   |   2 +
 .../developerMode/DeveloperModeEndpoint.hpp   |  17 ++-
 .../developerMode/DeveloperModeHelper.cpp     |   7 +-
 .../developerMode/DeveloperModeHelper.hpp     |  10 +-
 .../deviceInfo/DeviceInfoEndpoint.cpp         |  17 ++-
 .../deviceInfo/DeviceInfoEndpoint.hpp         |  14 +-
 .../endpoints/factoryReset/FactoryReset.cpp   |  18 ++-
 .../endpoints/factoryReset/FactoryReset.hpp   |   7 +
 .../factoryReset/FactoryResetEndpoint.cpp     |  12 +-
 .../factoryReset/FactoryResetEndpoint.hpp     |  14 +-
 .../endpoints/messages/MessageHelper.cpp      |  60 +++++----
 .../endpoints/messages/MessageHelper.hpp      |  21 ++-
 .../endpoints/messages/MessagesEndpoint.cpp   |   3 +-
 .../endpoints/messages/MessagesEndpoint.hpp   |  17 ++-
 .../endpoints/restore/RestoreEndpoint.cpp     |  14 +-
 .../endpoints/restore/RestoreEndpoint.hpp     |  15 ++-
 .../endpoints/update/UpdateEndpoint.cpp       |  15 ++-
 .../endpoints/update/UpdateEndpoint.hpp       |  15 ++-
 .../endpoints/update/UpdateMuditaOS.cpp       |  20 ++-
 .../endpoints/update/UpdateMuditaOS.hpp       |  12 +-
 .../service-desktop/parser/MessageHandler.cpp |  20 ++-
 .../service-desktop/parser/MessageHandler.hpp |  15 ++-
 .../service-desktop/parser/ParserFSM.cpp      |  17 ++-
 .../service-desktop/parser/ParserFSM.hpp      |   7 +
 .../service-desktop/parser/ParserUtils.cpp    |   2 +
 .../service-desktop/parser/ParserUtils.hpp    |   8 +-
 .../service-desktop/tests/unittest.cpp        |  39 +++---
 module-services/service-eink/ServiceEink.cpp  |  28 ++--
 module-services/service-eink/ServiceEink.hpp  |  14 +-
 .../board/linux/renderer/src/RArea.cpp        |  17 ++-
 .../board/linux/renderer/src/RArea.hpp        |   8 +-
 .../board/linux/renderer/src/RWindow.cpp      |  14 +-
 .../board/linux/renderer/src/RWindow.hpp      |  10 +-
 .../board/linux/renderer/src/gui_renderer.cpp |  28 ++--
 .../service-evtmgr/EventManager.cpp           |  60 ++++-----
 .../service-evtmgr/EventManager.hpp           |  11 +-
 .../service-evtmgr/WorkerEvent.cpp            |  66 +++++-----
 .../service-evtmgr/WorkerEvent.hpp            |  17 ++-
 .../alarm/EventManagerAlarm.cpp               |  26 ++--
 .../api/EventManagerServiceAPI.cpp            |  20 ++-
 .../api/EventManagerServiceAPI.hpp            |   8 +-
 .../service-evtmgr/harness/Parser.cpp         |  25 ++--
 .../service-evtmgr/harness/Parser.hpp         |  10 +-
 .../harness/actions/CellularCMD.cpp           |  15 ++-
 .../harness/actions/CellularCMD.hpp           |   6 +
 .../harness/events/AtResponse.cpp             |   6 +-
 .../harness/events/FocusApp.cpp               |   5 +-
 .../harness/events/FocusApp.hpp               |   4 +-
 .../service-evtmgr/harness/events/GPIO.cpp    |  13 +-
 .../service-evtmgr/harness/events/GPIO.hpp    |   6 +-
 .../harness/events/KeyPress.cpp               |  10 +-
 .../harness/events/KeyPress.hpp               |   5 +-
 .../harness/events/SysStart.cpp               |   4 +-
 .../harness/events/SysStart.hpp               |   4 +-
 .../service-evtmgr/messages/Message.cpp       |   4 +-
 module-services/service-fota/ServiceFota.cpp  |  51 ++++----
 module-services/service-fota/ServiceFota.hpp  |  22 +++-
 .../service-fota/api/FotaServiceAPI.cpp       |  17 +--
 .../service-fota/api/FotaServiceAPI.hpp       |   5 +-
 module-services/service-gui/ServiceGUI.cpp    |  51 ++++----
 module-services/service-gui/ServiceGUI.hpp    |  22 +++-
 module-services/service-gui/WorkerGUI.cpp     |  26 ++--
 module-services/service-gui/WorkerGUI.hpp     |   6 +-
 .../service-gui/messages/DrawMessage.cpp      |   6 +-
 .../service-gui/messages/DrawMessage.hpp      |  13 +-
 module-services/service-lwip/ServiceLwIP.cpp  |  25 ++--
 module-services/service-lwip/ServiceLwIP.hpp  |   8 +-
 module-services/service-time/ServiceTime.cpp  |  18 ++-
 module-services/service-time/ServiceTime.hpp  |  16 ++-
 .../timeEvents/CalendarTimeEvents.cpp         |  30 +++--
 .../timeEvents/CalendarTimeEvents.hpp         |  17 ++-
 .../service-time/timeEvents/TimeEvents.cpp    |  10 ++
 .../service-time/timeEvents/TimeEvents.hpp    |  17 ++-
 145 files changed, 1738 insertions(+), 732 deletions(-)

diff --git a/module-services/service-antenna/ServiceAntenna.cpp b/module-services/service-antenna/ServiceAntenna.cpp
index 56f9f1636439965b76d6aab37110b855b6733ebb..43e5cd304da20bfd4750861232265950c70c1858 100644
--- a/module-services/service-antenna/ServiceAntenna.cpp
+++ b/module-services/service-antenna/ServiceAntenna.cpp
@@ -2,21 +2,24 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ServiceAntenna.hpp"
-#include "Service/Timer.hpp"
-#include "api/AntennaServiceAPI.hpp"
-#include "log/log.hpp"
-#include "messages/AntennaMessage.hpp"
-#include "service-appmgr/ApplicationManager.hpp"
-#include <at/response.hpp>
-#include <memory>
-#include <module-utils/state/ServiceState.hpp>
-#include <service-cellular/messages/CellularMessage.hpp>
-
-#include "service-cellular/api/CellularServiceAPI.hpp"
-#include "time/time_conversion.hpp"
-#include <ticks.hpp>
-
-#include <cassert>
+
+#include <at/response.hpp> // for parseCSQ, isRegistered, parseCREG, parseNetworkFrequency, parseQNWINFO
+#include <module-utils/state/ServiceState.hpp>           // for State
+#include <service-cellular/messages/CellularMessage.hpp> // for CellularNotificationMessage, StateChange, CellularCallMessage, CellularNotificationMessage::Type, CellularNotificationMessage::Type::CallAborted
+#include <ticks.hpp>                                     // for Ticks
+#include <memory>                                        // for make_shared, unique_ptr, allocator, make_unique
+#include <algorithm>                                     // for max
+#include <string>                                        // for string
+#include <vector>                                        // for vector
+
+#include "Service/Timer.hpp"                           // for Timer
+#include "api/AntennaServiceAPI.hpp"                   // for LockRequest
+#include "log/log.hpp"                                 // for LOG_INFO, LOG_WARN, LOG_FATAL
+#include "messages/AntennaMessage.hpp"                 // for AntennaLockRequestResponse, AntennaLockRequestMessage
+#include "service-cellular/api/CellularServiceAPI.hpp" // for GetCSQ, GetAntenna, SelectAntenna, GetCREG, GetQNWINFO
+#include "MessageType.hpp" // for MessageType, MessageType::AntennaCSQChange, MessageType::AntennaChanged, MessageType::AntennaGetLockState, MessageType::AntennaLockService, MessageType::CellularCall, MessageType::CellularNotification, MessageType::CellularStateRequest, MessageType::StateChange
+#include "projdefs.h"      // for pdMS_TO_TICKS
+#include "service-cellular/State.hpp" // for State, State::ST, State::ST::Ready
 
 const char *ServiceAntenna::serviceName = "ServiceAntenna";
 
diff --git a/module-services/service-antenna/ServiceAntenna.hpp b/module-services/service-antenna/ServiceAntenna.hpp
index bf603a30138b969ceb90ba8704c9f6c95fe60472..b6c4457cf2477550d4d7310b64867d722530791f 100644
--- a/module-services/service-antenna/ServiceAntenna.hpp
+++ b/module-services/service-antenna/ServiceAntenna.hpp
@@ -3,17 +3,30 @@
 
 #pragma once
 
+#include <module-utils/state/ServiceState.hpp>
+#include <stdint.h> // for uint32_t
 #include <algorithm>
 #include <cassert>
+#include <memory> // for unique_ptr
 
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
 #include "Service/Worker.hpp"
 #include "MessageType.hpp"
+#include "bsp/cellular/bsp_cellular.hpp" // for antenna
+#include "Service/Common.hpp"            // for ReturnCodes, ServicePowerMode
 
-#include <module-utils/state/ServiceState.hpp>
-
-#include "bsp/cellular/bsp_cellular.hpp"
+namespace sys
+{
+    class Timer;
+} // namespace sys
+namespace utils
+{
+    namespace state
+    {
+        template <typename T> class State;
+    } // namespace state
+} // namespace utils
 
 namespace antenna
 {
diff --git a/module-services/service-antenna/api/AntennaServiceAPI.cpp b/module-services/service-antenna/api/AntennaServiceAPI.cpp
index 112e2dc574b8c5253fdd68b80e3c9d402b4e1054..dbb89446ac81094e8835585383c831f971a151ee 100644
--- a/module-services/service-antenna/api/AntennaServiceAPI.cpp
+++ b/module-services/service-antenna/api/AntennaServiceAPI.cpp
@@ -2,7 +2,22 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AntennaServiceAPI.hpp"
-#include "../messages/AntennaMessage.hpp"
+
+#include <memory>  // for make_shared, allocator, shared_ptr, __shared_ptr<>::element_type
+#include <utility> // for pair
+
+#include "../messages/AntennaMessage.hpp" // for AntennaLockRequestMessage, AntennaLockRequestResponse
+#include "MessageType.hpp" // for MessageType, MessageType::AntennaCSQChange, MessageType::AntennaGetLockState, MessageType::AntennaLockService
+#include "Service/Bus.hpp"     // for Bus
+#include "Service/Common.hpp"  // for ReturnCodes, ReturnCodes::Success, BusChannels, BusChannels::AntennaNotifications
+#include "Service/Message.hpp" // for DataMessage
+#include "service-antenna/ServiceAntenna.hpp" // for ServiceAntenna, ServiceAntenna::serviceName, lockState
+
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 namespace AntennaServiceAPI
 {
 
diff --git a/module-services/service-antenna/api/AntennaServiceAPI.hpp b/module-services/service-antenna/api/AntennaServiceAPI.hpp
index 4731711cefd5b6e6e97e78582ad9aae1efd49562..c52a89c57af29dbea22cb95dce0ed08b0e7243af 100644
--- a/module-services/service-antenna/api/AntennaServiceAPI.hpp
+++ b/module-services/service-antenna/api/AntennaServiceAPI.hpp
@@ -6,7 +6,12 @@
 #include <MessageType.hpp>
 #include <Service/Message.hpp>
 
-#include "../ServiceAntenna.hpp"
+#include "../ServiceAntenna.hpp" // for lockState
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace AntennaServiceAPI
 {
diff --git a/module-services/service-appmgr/ApplicationManager.cpp b/module-services/service-appmgr/ApplicationManager.cpp
index e6aad1b4182309d3fc82e8396b467849f2d105c9..b2125a70e940a0ad282453715a8a14598c8d644f 100644
--- a/module-services/service-appmgr/ApplicationManager.cpp
+++ b/module-services/service-appmgr/ApplicationManager.cpp
@@ -2,24 +2,28 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "service-appmgr/ApplicationManager.hpp"
-#include "service-appmgr/Controller.hpp"
 
-#include <utility>
-#include <module-apps/application-desktop/data/LockPhoneData.hpp>
-
-#include "application-call/ApplicationCall.hpp"
-#include "application-special-input/ApplicationSpecialInput.hpp"
-
-#include "Service/Message.hpp"
-#include "AppMessage.hpp"
-
-#include "Service/Timer.hpp"
-#include "service-db/api/DBServiceAPI.hpp"
-#include "service-evtmgr/EventManager.hpp"
-#include "service-eink/ServiceEink.hpp"
-#include "service-gui/ServiceGUI.hpp"
-
-#include "log/log.hpp"
+#include <utility>   // for move
+#include <algorithm> // for find_if
+#include <limits>    // for numeric_limits
+
+#include "service-appmgr/Controller.hpp"                         // for Controller
+#include "application-call/ApplicationCall.hpp"                  // for name_call
+#include "application-special-input/ApplicationSpecialInput.hpp" // for special_input
+#include "Service/Message.hpp"             // for ResponseMessage, DataMessage (ptr only), Message_t
+#include "AppMessage.hpp"                  // for AppSwitchWindowMessage
+#include "Service/Timer.hpp"               // for Timer, Timer::Type, Timer::Type::SingleShot, ms
+#include "service-db/api/DBServiceAPI.hpp" // for DBServiceAPI
+#include "service-evtmgr/EventManager.hpp" // for EventManager
+#include "service-eink/ServiceEink.hpp"    // for ServiceEink
+#include "service-gui/ServiceGUI.hpp"      // for ServiceGUI
+#include "log/log.hpp"                     // for LOG_INFO, LOG_ERROR, LOG_WARN, LOG_DEBUG, LOG_FATAL
+#include "Common.hpp"                      // for ShowMode, ShowMode::GUI_SHOW_INIT
+#include "Common/Common.hpp" // for SettingsLanguage, SettingsLanguage::ENGLISH, SettingsLanguage::GERMAN, SettingsLanguage::POLISH, SettingsLanguage::SPANISH
+#include "Service/Bus.hpp"   // for Bus
+#include "SystemManager/SystemManager.hpp"        // for SystemManager
+#include "i18/i18.hpp"                            // for Lang, Lang::En, Lang::De, Lang::Pl, Lang::Sp, i18, localize
+#include "service-appmgr/messages/APMMessage.hpp" // for APMCheckApp, APMSwitch, APMRegister, APMConfirmClose, APMConfirmSwitch, Action, APMAction, APMChangeLanguage, APMSwitchPrevApp, APMDelayedClose, APMClose, APMInitPowerSaveMode, APMPreventBlocking
 
 // Auto phone lock disabled for now till the times when it's debugged
 // #define AUTO_PHONE_LOCK_ENABLED
diff --git a/module-services/service-appmgr/ApplicationManager.hpp b/module-services/service-appmgr/ApplicationManager.hpp
index d5078e309ef5ed20454c2e86c20af90ec32cb87c..0ae73da55a31109dc08d685427f3b3cae383b19a 100644
--- a/module-services/service-appmgr/ApplicationManager.hpp
+++ b/module-services/service-appmgr/ApplicationManager.hpp
@@ -3,16 +3,35 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include "Application.hpp"
-#include "ApplicationLauncher.hpp"
+#include <memory>      // for unique_ptr, allocator
+#include <string>      // for string
+#include <deque>       // for deque
+#include <string_view> // for string_view
+#include <vector>      // for vector
+
+#include "Application.hpp"         // for Application, Application::State
+#include "ApplicationLauncher.hpp" // for ApplicationLauncher
 #include "messages/APMMessage.hpp"
+#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
+#include "Service/Service.hpp" // for Service
+#include "Service/Timer.hpp"   // for Timer
+#include "SettingsRecord.hpp"  // for SettingsRecord
+#include "SwitchData.hpp"      // for SwitchData
 
 namespace app
 {
     class ApplicationLauncher;
+    namespace manager
+    {
+        class APMAction;
+        class APMChangeLanguage;
+        class APMConfirmClose;
+        class APMConfirmSwitch;
+        class APMRegister;
+        class APMSwitch;
+        class APMSwitchPrevApp;
+    } // namespace manager
 }
 
 namespace app::manager
diff --git a/module-services/service-appmgr/Controller.cpp b/module-services/service-appmgr/Controller.cpp
index b7e047777c93c5936e6205bcb7e4167bc80f06f0..f2b692aed5e1f41b6f546ac1d067feb7bd1f7d04 100644
--- a/module-services/service-appmgr/Controller.cpp
+++ b/module-services/service-appmgr/Controller.cpp
@@ -3,7 +3,11 @@
 
 #include "Controller.hpp"
 
-#include "module-sys/Service/Bus.hpp"
+#include <utility> // for move
+
+#include "module-sys/Service/Bus.hpp" // for Bus
+#include "Service/Service.hpp"        // for Service
+#include "service-appmgr/ApplicationManager.hpp" // for ApplicationManager, ApplicationManager::ServiceName, ApplicationHandle, ApplicationHandle::Name
 
 namespace app::manager
 {
diff --git a/module-services/service-appmgr/Controller.hpp b/module-services/service-appmgr/Controller.hpp
index d400012c5ef13a25d9de6efe6917a6ba0b90cce4..85d48b25fd23e88ecaf94fbcaa22690ac12f90ab 100644
--- a/module-services/service-appmgr/Controller.hpp
+++ b/module-services/service-appmgr/Controller.hpp
@@ -3,9 +3,19 @@
 
 #pragma once
 
-#include "ApplicationManager.hpp"
+#include <memory> // for unique_ptr
+#include <string> // for string
 
+#include "ApplicationManager.hpp" // for ApplicationHandle, ApplicationHandle::Name
 #include "module-sys/Service/Service.hpp"
+#include "SwitchData.hpp"                         // for SwitchData
+#include "i18/i18.hpp"                            // for Lang
+#include "service-appmgr/messages/APMMessage.hpp" // for APMSwitchPrevApp, Action (ptr only)
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace app::manager
 {
diff --git a/module-services/service-audio/api/AudioServiceAPI.cpp b/module-services/service-audio/api/AudioServiceAPI.cpp
index 2e265208d5adb1d18a5e5f17ea75c22784e61686..63f621c2255cc511069d8f0b32883f5a68cbbda2 100644
--- a/module-services/service-audio/api/AudioServiceAPI.cpp
+++ b/module-services/service-audio/api/AudioServiceAPI.cpp
@@ -2,8 +2,20 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AudioServiceAPI.hpp"
-#include "Service/Bus.hpp"
-#include "../ServiceAudio.hpp"
+
+#include <utility> // for move, pair
+
+#include "Service/Bus.hpp"                         // for Bus, defaultCmdTimeout
+#include "../ServiceAudio.hpp"                     // for ServiceAudio, ServiceAudio::serviceName
+#include "Audio/decoder/decoder.hpp"               // for Tags
+#include "Service/Common.hpp"                      // for ReturnCodes, ReturnCodes::Success
+#include "log/log.hpp"                             // for LOG_DEBUG, LOG_ERROR
+#include "service-audio/messages/AudioMessage.hpp" // for AudioStopRequest, AudioResponseMessage, AudioEventRequest, AudioGetFileTagsRequest, AudioGetSetting, AudioKeyPressedRequest, AudioPauseRequest, AudioResumeRequest, AudioStartPlaybackRequest, AudioStartRecorderRequest, AudioStartRoutingRequest, AudioMessage, AudioSetSetting (ptr only)
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace audio;
 namespace AudioServiceAPI
diff --git a/module-services/service-audio/api/AudioServiceAPI.hpp b/module-services/service-audio/api/AudioServiceAPI.hpp
index 4560aa6d332dea2ca363a0cec3c62b0b89547b73..19bdca11855a05345aea40cb90c505eb15b6873c 100644
--- a/module-services/service-audio/api/AudioServiceAPI.hpp
+++ b/module-services/service-audio/api/AudioServiceAPI.hpp
@@ -3,12 +3,25 @@
 
 #pragma once
 
+#include <optional> // for optional
+#include <memory>   // for shared_ptr
+#include <string>   // for string
+#include <vector>   // for vector
+
 #include "../messages/AudioMessage.hpp"
 #include "Audio/decoder/decoder.hpp"
-
-#include <optional>
+#include "Audio/AudioCommon.hpp" // for PlaybackType, PlaybackType::None, Token (ptr only), RetCode, Setting, Event (ptr only), EventType
+#include "Audio/Profiles/Profile.hpp" // for Profile, Profile::Type, Profile::Type::Idle
 
 class Service;
+namespace audio
+{
+    struct Tags;
+} // namespace audio
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 /**
  * Audio service API.
diff --git a/module-services/service-bluetooth/ServiceBluetooth.cpp b/module-services/service-bluetooth/ServiceBluetooth.cpp
index 3c81762bb5f9f238c31d279bbc93f20812e9b25f..36d10096ac762255fd823714445fc90f5e217048 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.cpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.cpp
@@ -2,14 +2,19 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ServiceBluetooth.hpp"
-#include "Constants.hpp"
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
-#include "messages/BluetoothMessage.hpp"
-#include <log/log.hpp>
-#include <service-lwip/ServiceLwIP.hpp>
-#include <module-sys/Service/Bus.hpp>
+
+#include <log/log.hpp>                // for LOG_INFO, LOG_ERROR
+#include <module-sys/Service/Bus.hpp> // for Bus
+#include <bits/exception.h>           // for exception
+#include <utility>                    // for move
+
+#include "Constants.hpp"       // for bluetooth
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for ResponseMessage, Message_t, DataMessage
+#include "MessageType.hpp" // for MessageType, MessageType::BluetoothAddrResult, MessageType::BluetoothRequest, MessageType::BluetoothRequestStream
+#include "messages/BluetoothMessage.hpp" // for BluetoothMessage, BluetoothRequestStreamResultMessage, BluetoothAddrMessage, BluetoothMessage::PAN, BluetoothMessage::Play, BluetoothMessage::Scan, BluetoothMessage::Start, BluetoothMessage::Stop, BluetoothMessage::StopScan, BluetoothMessage::Visible
+#include "BluetoothWorker.hpp"           // for BluetoothWorker
+#include "interface/profiles/Profile.hpp" // for Profile
 
 ServiceBluetooth::ServiceBluetooth() : sys::Service(service::name::bluetooth)
 {
diff --git a/module-services/service-bluetooth/ServiceBluetooth.hpp b/module-services/service-bluetooth/ServiceBluetooth.hpp
index 81e467de105dae723a927d68461be2dec9311ebf..f95b5152ad6aec60c9d10c09aa93f5caa836f0d1 100644
--- a/module-services/service-bluetooth/ServiceBluetooth.hpp
+++ b/module-services/service-bluetooth/ServiceBluetooth.hpp
@@ -3,9 +3,14 @@
 
 #pragma once
 
+#include <memory> // for unique_ptr
+
 #include "Bluetooth/BluetoothWorker.hpp"
-#include "Service/Service.hpp"
-#include <memory>
+#include "Service/Service.hpp" // for Service
+#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
+
+class BluetoothWorker;
 
 class ServiceBluetooth : public sys::Service
 {
diff --git a/module-services/service-cellular/CellularCall.cpp b/module-services/service-cellular/CellularCall.cpp
index 046ad657842850f6b8d0415e3b68b24cd631a5fb..d128528d9ff74974d4c864987407a23b8bc24651 100644
--- a/module-services/service-cellular/CellularCall.cpp
+++ b/module-services/service-cellular/CellularCall.cpp
@@ -2,15 +2,19 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CellularCall.hpp"
-#include <Modem/ATParser.hpp>
-#include <Utils.hpp>
-#include <log/log.hpp>
-#include <time/time_conversion.hpp>
-#include <bsp/rtc/rtc.hpp>
-
-#include <vector>
-#include <string>
-#include <sstream>
+
+#include <Utils.hpp>                // for enum_cast, split
+#include <log/log.hpp>              // for LOG_ERROR
+#include <time/time_conversion.hpp> // for Timestamp, operator-, Duration
+#include <inttypes.h>               // for PRIu32
+#include <vector>                   // for vector
+#include <string>    // for allocator, stoul, operator+, string, char_traits, operator<<, basic_string, to_string
+#include <sstream>   // for operator<<, basic_ostream, basic_ostream<>::__ostream_type, ostream
+#include <optional>  // for optional
+#include <stdexcept> // for runtime_error
+
+#include "CalllogRecord.hpp" // for CalllogRecord
+#include "PhoneNumber.hpp"   // for PhoneNumber::View, PhoneNumber
 
 namespace ModemCall
 {
diff --git a/module-services/service-cellular/CellularCall.hpp b/module-services/service-cellular/CellularCall.hpp
index ae4d92d5dac49bbdba912772d9897ee4430f995d..9dd5c86f1cdce33b0ecc2a576243e5b4a21eb0fe 100644
--- a/module-services/service-cellular/CellularCall.hpp
+++ b/module-services/service-cellular/CellularCall.hpp
@@ -3,12 +3,17 @@
 
 #pragma once
 
-#include <PhoneNumber.hpp>
-#include <Interface/CalllogRecord.hpp>
-#include <time/time_conversion.hpp>
-
-#include <functional>
-#include <string>
+#include <PhoneNumber.hpp>             // for PhoneNumber::View, PhoneNumber
+#include <Interface/CalllogRecord.hpp> // for CalllogRecord
+#include <time/time_conversion.hpp>    // for Timestamp
+#include <stdint.h>                    // for uint8_t, int8_t
+#include <sys/types.h>                 // for time_t
+#include <functional>                  // for function
+#include <string>                      // for string
+#include <iosfwd>                      // for ostream
+
+#include "Tables/CalllogTable.hpp" // for CallType, CallType::CT_NONE
+#include "utf8/UTF8.hpp"           // for UTF8
 
 namespace ModemCall
 {
diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp
index 2367d7e7a512ce0e4e8a5a4a837a4653500531ff..8bb8fd46a76804edc13e92f3e0bf212b7db4fcad 100644
--- a/module-services/service-cellular/ServiceCellular.cpp
+++ b/module-services/service-cellular/ServiceCellular.cpp
@@ -1,63 +1,71 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <algorithm>
-#include <cassert>
-#include <iostream>
-#include <iterator>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <ctime>
-#include <functional>
-#include <iomanip>
-
-#include "Service/Message.hpp"
-#include "Service/Service.hpp"
-#include "Service/Timer.hpp"
+#include <Utils.hpp>       // for removeNewLines, enumToString, split, to_string
+#include <at/URC_QIND.hpp> // for QIND
+#include <at/URC_CUSD.hpp> // for CUSD
+#include <at/URC_CTZE.hpp> // for CTZE
+#include <at/URC_CREG.hpp> // for CREG
+#include <at/response.hpp> // for parseQNWINFO
+#include <common_data/EventStore.hpp> // for GSM, GSM::SIM, GSM::SIM::SIM1, GSM::SIM::SIM_FAIL, GSM::SIM::SIM2, GSM::Tray, GSM::Tray::IN, Network
+#include <service-evtmgr/Constants.hpp>                                    // for evt_manager
+#include <country.hpp>                                                     // for Id, Id::UNKNOWN
+#include <PhoneNumber.hpp>                                                 // for PhoneNumber::View, PhoneNumber
+#include <module-db/queries/notifications/QueryNotificationsIncrement.hpp> // for Increment
+#include <module-db/queries/messages/sms/QuerySMSSearchByType.hpp>         // for SMSSearchByType, SMSSearchByTypeResult
+#include <log/log.hpp>      // for LOG_DEBUG, LOG_ERROR, LOG_INFO, LOG_FATAL, LOG_WARN, LOG_TRACE
+#include <bits/exception.h> // for exception
+#include <algorithm>        // for remove, max
+#include <cassert>          // for assert
+#include <iostream>         // for basic_istream, istringstream
+#include <string>   // for string, allocator, basic_string, operator+, char_traits, to_string, stoi, getline, operator!=
+#include <vector>   // for vector
+#include <utility>  // for move
+#include <optional> // for optional, nullopt, operator==
+#include <map>      // for map
+
+#include "Service/Message.hpp" // for DataMessage, ResponseMessage, Message_t
+#include "Service/Service.hpp" // for Service
+#include "Service/Timer.hpp"   // for Timer
 #include "ServiceCellular.hpp"
-
-#include "MessageType.hpp"
-
-#include "messages/CellularMessage.hpp"
-
-#include "SignalStrength.hpp"
-#include "service-appmgr/ApplicationManager.hpp"
-#include "service-appmgr/messages/APMMessage.hpp"
-#include "service-evtmgr/messages/EVMessages.hpp"
-#include "ucs2/UCS2.hpp"
-
-#include "api/CellularServiceAPI.hpp"
-#include "service-db/api/DBServiceAPI.hpp"
-#include "service-db/messages/DBNotificationMessage.hpp"
-#include "service-db/messages/QueryMessage.hpp"
-
-#include "service-evtmgr/api/EventManagerServiceAPI.hpp"
-#include "service-antenna/api/AntennaServiceAPI.hpp"
-#include "service-antenna/messages/AntennaMessage.hpp"
-
-#include "time/time_conversion.hpp"
-#include <Utils.hpp>
-#include <at/URC_QIND.hpp>
-#include <at/URC_CUSD.hpp>
-#include <at/URC_CTZE.hpp>
-#include <at/URC_CREG.hpp>
-#include <at/response.hpp>
-#include <common_data/EventStore.hpp>
-#include <service-evtmgr/Constants.hpp>
-#include <country.hpp>
-#include <PhoneNumber.hpp>
-#include <module-db/queries/notifications/QueryNotificationsIncrement.hpp>
-#include <module-db/queries/messages/sms/QuerySMSSearchByType.hpp>
-
-#include <log/log.hpp>
-
-#include <vector>
-#include <utility>
-#include <optional>
-#include <string>
-#include <ticks.hpp>
+#include "MessageType.hpp" // for MessageType, MessageType::CellularGetAntenna, MessageType::CellularListCurrentCalls, MessageType::CellularAnswerIncomingCall, MessageType::CellularCall, MessageType::CellularCallRequest, MessageType::CellularGetCREG, MessageType::CellularGetCSQ, MessageType::CellularGetFirmwareVersion, MessageType::CellularGetIMSI, MessageType::CellularGetNWINFO, MessageType::CellularGetNetworkInfo, MessageType::CellularGetOwnNumber, MessageType::CellularGetScanMode, MessageType::CellularGetScanModeResult, MessageType::CellularHangupCall, MessageType::CellularNetworkInfoResult, MessageType::CellularNotification, MessageType::CellularOperatorsScanResult, MessageType::CellularSelectAntenna, MessageType::CellularSetScanMode, MessageType::CellularSimProcedure, MessageType::CellularStartOperatorsScan, MessageType::CellularStateRequest, MessageType::CellularTransmitDtmfTones, MessageType::CellularUSSDRequest, MessageType::DBServiceNotification, MessageType::EVMModemStatus, MessageType::EVMTimeUpdated
+#include "messages/CellularMessage.hpp" // for CellularResponseMessage, CellularNotificationMessage, CellularNotificationMessage::Type, CellularCallMessage, CellularUSSDMessage, RawCommandRespAsync, RawCommandResp, CellularUSSDMessage::RequestType, CellularRequestMessage, StateChange, CellularGetChannelMessage, CellularGetChannelResponseMessage, CellularAntennaResponseMessage, CellularCallMessage::Type, CellularTimeNotificationMessage, CellularUSSDMessage::RequestType::abortSesion, CellularAntennaRequestMessage, CellularCallRequestMessage, CellularNotificationMessage::Type::CallActive, RawCommand, CellularCallMessage::Type::IncomingCall, CellularCallMessage::Type::Ringing, CellularDtmfRequestMessage, CellularNotificationMessage::Type::CallAborted, CellularNotificationMessage::Type::NetworkStatusUpdate, CellularNotificationMessage::Type::NewIncomingSMS, CellularNotificationMessage::Type::NewIncomingUSSD, CellularNotificationMessage::Type::PowerDownDeregistered, CellularNotificationMessage::Type::PowerDownDeregistering, CellularNotificationMessage::Type::SIM, CellularNotificationMessage::Type::SignalStrengthUpdate, CellularUSSDMessage::RequestType::pushSesionRequest, CellularNotificationMessage::Type::PowerUpProcedureComplete, CellularNotificationMessage::Type::RawCommand, CellularUSSDMessage::RequestType::pullSesionRequest
+#include "SignalStrength.hpp"           // for SignalStrength
+#include "service-evtmgr/messages/EVMessages.hpp"        // for SIMMessage, StatusStateMessage
+#include "ucs2/UCS2.hpp"                                 // for UCS2
+#include "api/CellularServiceAPI.hpp"                    // for USSDRequest
+#include "service-db/api/DBServiceAPI.hpp"               // for DBServiceAPI
+#include "service-db/messages/DBNotificationMessage.hpp" // for NotificationMessage
+#include "service-db/messages/QueryMessage.hpp"          // for QueryResponse
+#include "service-evtmgr/api/EventManagerServiceAPI.hpp" // for GetBoard
+#include "service-antenna/api/AntennaServiceAPI.hpp"     // for CSQChange, LockRequest
+#include "service-antenna/messages/AntennaMessage.hpp"   // for AntennaChangedMessage
+#include "time/time_conversion.hpp"                      // for Timestamp
+#include "Audio/AudioCommon.hpp"                         // for PlaybackType, PlaybackType::TextMessageRingtone
+#include "AudioServiceAPI.hpp"                           // for PlaybackStart
+#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Notifications, Interface::Name::SMS
+#include "CalllogRecord.hpp" // for CalllogRecord
+#include "Commands.hpp" // for AT, factory, Cmd, AT::SMS_GSM, getCommadsSet, AT::CREG, AT::CSQ, AT::QNWINFO, AT::QSIMSTAT, AT::SMS_UCSC2, AT::ATA, AT::ATD, AT::ATH, AT::CEER, AT::CIMI, AT::CLCC, AT::CMGD, AT::CMGS, AT::CNUM, AT::CUSD_CLOSE_SESSION, AT::CUSD_OPEN_SESSION, AT::CUSD_SEND, AT::DISABLE_TIME_ZONE_REPORTING, AT::DISABLE_TIME_ZONE_UPDATE, AT::ENABLE_NETWORK_REGISTRATION_URC, AT::ENABLE_TIME_ZONE_UPDATE, AT::GET_SCANMODE, AT::IPR, AT::QCMGR, AT::QCMGS, AT::QGMR, AT::QLDTMF, AT::SET_SCANMODE, AT::SET_SMS_TEXT_MODE_UCS2, AT::SET_TIME_ZONE_REPORTING, AT::SIMSTAT_ON, AT::SIM_DET, AT::SIM_DET_ON, AT::STORE_SETTINGS_ATW, AT::VTS, commadsSet, commadsSet::simInit
+#include "Common/Common.hpp"          // for SMSType, SMSType::QUEUED, SMSType::FAILED, SMSType::INBOX, SMSType::OUTBOX
+#include "Common/Query.hpp"           // for Query, Query::Type, Query::Type::Create, Query::Type::Update, QueryResult
+#include "Modem/ATCommon.hpp"         // for Chanel, Chanel::BUSY, Chanel::NO_ANSWER, Chanel::NO_CARRIER
+#include "Modem/ATParser.hpp"         // for ATParser
+#include "Modem/TS0710/DLC_channel.h" // for DLC_channel, DLC_channel::Callback_t
+#include "Modem/TS0710/TS0710.h" // for TS0710, TS0710::Channel, TS0710::Channel::Commands, TS0710::ConfState, TS0710::ConfState::Success, TS0710::Channel::Notifications, TS0710::ConfState::Failure, TS0710::Mode, TS0710::Mode::AT
+#include "Modem/TS0710/TS0710_START.h" // for TS0710_START::START_SystemParameters_t
+#include "NotificationsRecord.hpp" // for NotificationsRecord, NotificationsRecord::Key, NotificationsRecord::Key::Calls, NotificationsRecord::Key::Sms
+#include "Result.hpp"              // for Result, Result::Code, Result::Code::OK
+#include "Service/Bus.hpp"         // for Bus
+#include "Tables/CalllogTable.hpp" // for CallType, CallType::CT_INCOMING, CallType::CT_MISSED, CallType::CT_OUTGOING
+#include "Tables/Record.hpp"       // for DB_ID_NONE
+#include "bsp/cellular/bsp_cellular.hpp" // for hotswap_trigger, sim_sel, value, Cellular, antenna, antenna::lowBand, status, value::ACTIVE, value::INACTIVE
+#include "projdefs.h"                         // for pdMS_TO_TICKS
+#include "service-antenna/ServiceAntenna.hpp" // for lockState, lockState::unlocked
+#include "service-cellular/CellularCall.hpp" // for CellularCall, ModemCall, operator<<, CallState, CallState::Active, Forced, Forced::True
+#include "service-cellular/State.hpp" // for State, State::ST, State::ST::CellularConfProcedure, State::ST::Failed, State::ST::PowerUpInProgress, State::ST::PowerUpProcedure, State::ST::ModemFatalFailure, State::ST::PowerDownWaiting, State::ST::AudioConfigurationProcedure, State::ST::Idle, State::ST::PowerDown, State::ST::SimInit, State::ST::ModemOn, State::ST::PowerDownStarted, State::ST::Ready, State::ST::SanityCheck, State::ST::SimSelect, State::ST::StatusCheck, State::ST::URCReady, cellular
+#include "service-cellular/USSD.hpp" // for State, State::pullRequestSent, State::sesionAborted, State::pullResponseReceived, State::pushSesion, noTimeout, State::none, pullResponseTimeout, pullSesionTimeout
+#include "task.h"                    // for vTaskDelay
+#include "utf8/UTF8.hpp"             // for UTF8
 
 const char *ServiceCellular::serviceName = "ServiceCellular";
 
diff --git a/module-services/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/ServiceCellular.hpp
index f93333e15fc43ccf7ba4027a7cc83f828b175468..2398ba1f436ca0a3689ea399b3a26af3aea69da0 100644
--- a/module-services/service-cellular/ServiceCellular.hpp
+++ b/module-services/service-cellular/ServiceCellular.hpp
@@ -4,20 +4,38 @@
 #ifndef PUREPHONE_SERVICECELLULAR_HPP
 #define PUREPHONE_SERVICECELLULAR_HPP
 
-#include "CellularCall.hpp"
-#include "USSD.hpp"
-#include "SMSRecord.hpp"
-#include <Modem/TS0710/DLC_channel.h>
-#include <Modem/TS0710/TS0710.h>
-#include <Service/Service.hpp>
-#include "messages/CellularMessage.hpp"
+#include <Modem/TS0710/DLC_channel.h> // for DLC_channel::Callback_t, DLC_channel
+#include <Modem/TS0710/TS0710.h>      // for TS0710
+#include <Service/Service.hpp>        // for Service
 #include <utf8/UTF8.hpp>
-#include "State.hpp"
-#include "bsp/common.hpp"
-
-#include <optional>
+#include <stdint.h> // for uint32_t
+#include <optional> // for optional
+#include <memory>   // for unique_ptr, allocator, make_unique, shared_ptr
+#include <string>   // for string
+#include <vector>   // for vector
+
+#include "CellularCall.hpp"             // for CellularCall
+#include "USSD.hpp"                     // for State, State::none
+#include "SMSRecord.hpp"                // for SMSRecord
+#include "messages/CellularMessage.hpp" // for CellularUSSDMessage, CellularUSSDMessage::RequestType
+#include "State.hpp"                    // for State
+#include "bsp/common.hpp"               // for Board, Board::none
+#include "Modem/TS0710/TS0710_types.h"  // for PS460800, PortSpeed_e
+#include "Service/Common.hpp"           // for ReturnCodes, ServicePowerMode
+#include "Service/Message.hpp"          // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
 
 class MuxDaemon;
+namespace db
+{
+    namespace query
+    {
+        class SMSSearchByTypeResult;
+    } // namespace query
+} // namespace db
+namespace sys
+{
+    class Timer;
+} // namespace sys
 
 class ServiceCellular : public sys::Service
 {
diff --git a/module-services/service-cellular/SignalStrength.hpp b/module-services/service-cellular/SignalStrength.hpp
index a5113d5cbbe17194cf852a08f5c343d487858717..ce0e3f847c292ebde6b971d2030b29e8eb55a2ee 100644
--- a/module-services/service-cellular/SignalStrength.hpp
+++ b/module-services/service-cellular/SignalStrength.hpp
@@ -3,9 +3,10 @@
 
 #pragma once
 
-#include "common_data/EventStore.hpp"
 #include <limits>
 
+#include "common_data/EventStore.hpp" // for SignalStrength, RssiBar
+
 class SignalStrength
 {
     // <rssi>   0           -113dBm or less
diff --git a/module-services/service-cellular/api/CellularServiceAPI.cpp b/module-services/service-cellular/api/CellularServiceAPI.cpp
index f3c86c6428bde0a76a2ffe4a51bb06be42f2e878..67d0eba6a0c821f54808bd308046c50b7611b90d 100644
--- a/module-services/service-cellular/api/CellularServiceAPI.cpp
+++ b/module-services/service-cellular/api/CellularServiceAPI.cpp
@@ -1,17 +1,25 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "../ServiceCellular.hpp"
+#include <PhoneNumber.hpp> // for PhoneNumber
+#include <Service/Bus.hpp> // for Bus
+#include <memory> // for make_shared, shared_ptr, allocator, dynamic_pointer_cast, operator!=, __shared_ptr_access, __shared_ptr<>::element_type
+#include <string> // for string
+#include <utility> // for pair, move
 
+#include "../ServiceCellular.hpp" // for ServiceCellular, ServiceCellular::serviceName
 #include "CellularServiceAPI.hpp"
-
-#include <PhoneNumber.hpp>
-#include <Service/Bus.hpp>
-#include <utf8/UTF8.hpp>
-
-#include <memory>
-#include <string>
-#include <utility>
+#include "MessageType.hpp" // for MessageType, MessageType::CellularAnswerIncomingCall, MessageType::CellularGetAntenna, MessageType::CellularGetCREG, MessageType::CellularGetCSQ, MessageType::CellularGetFirmwareVersion, MessageType::CellularGetIMSI, MessageType::CellularGetNWINFO, MessageType::CellularGetNetworkInfo, MessageType::CellularGetOwnNumber, MessageType::CellularGetScanMode, MessageType::CellularHangupCall, MessageType::CellularSelectAntenna, MessageType::CellularSetScanMode, MessageType::CellularStartOperatorsScan
+#include "Modem/TS0710/TS0710.h"                         // for TS0710, TS0710::Channel, TS0710::Channel::Data
+#include "Service/Common.hpp"                            // for ReturnCodes, ReturnCodes::Success
+#include "bsp/cellular/bsp_cellular.hpp"                 // for antenna
+#include "log/log.hpp"                                   // for LOG_ERROR, LOG_DEBUG
+#include "service-cellular/messages/CellularMessage.hpp" // for CellularRequestMessage, CellularResponseMessage, CellularAntennaRequestMessage, CellularUSSDMessage, CellularCallRequestMessage, CellularDtmfRequestMessage, CellularGetChannelMessage, CellularAntennaResponseMessage, CellularUSSDMessage::RequestType
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 bool CellularServiceAPI::DialNumber(sys::Service *serv, const utils::PhoneNumber &number)
 {
diff --git a/module-services/service-cellular/api/CellularServiceAPI.hpp b/module-services/service-cellular/api/CellularServiceAPI.hpp
index 7aca02fc738eef1d2673dd3096c890077d15a5ed..298cbd0b481aa5381bb2f9d99769a3744a3728e2 100644
--- a/module-services/service-cellular/api/CellularServiceAPI.hpp
+++ b/module-services/service-cellular/api/CellularServiceAPI.hpp
@@ -2,13 +2,20 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "../messages/CellularMessage.hpp"
+#include <Modem/TS0710/TS0710.h> // for TS0710, TS0710::Channel
+#include <PhoneNumber.hpp>       // for PhoneNumber
+#include <stdint.h>              // for uint32_t
+#include <string>                // for string, allocator
+
+#include "../messages/CellularMessage.hpp" // for CellularUSSDMessage, CellularUSSDMessage::RequestType
 #include "utf8/UTF8.hpp"
-#include <Modem/TS0710/TS0710.h>
+#include "module-bsp/bsp/cellular/bsp_cellular.hpp" // for antenna
 
-#include <PhoneNumber.hpp>
-#include "module-bsp/bsp/cellular/bsp_cellular.hpp"
 class Service;
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace CellularServiceAPI
 {
diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp
index 25bcef3aa81c9c609196092c00cd4935be8d5fad..83f9832c6d1756057942fa68062de0c046c2bcec 100644
--- a/module-services/service-db/ServiceDB.cpp
+++ b/module-services/service-db/ServiceDB.cpp
@@ -3,27 +3,55 @@
 
 #include "ServiceDB.hpp"
 
-#include "messages/DBSMSMessage.hpp"
-#include "messages/DBThreadMessage.hpp"
-#include "messages/DBNotificationMessage.hpp"
-#include "messages/DBSettingsMessage.hpp"
-#include "messages/DBSMSTemplateMessage.hpp"
-#include "messages/DBContactMessage.hpp"
-#include "messages/DBAlarmMessage.hpp"
-#include "messages/DBNotesMessage.hpp"
-#include "messages/DBCalllogMessage.hpp"
-#include "messages/DBCountryCodeMessage.hpp"
-#include <messages/DBServiceMessage.hpp>
-
-#include "Database/Database.hpp"
-
-#include "log/log.hpp"
-
-#include "includes/DBServiceName.hpp"
-#include "messages/QueryMessage.hpp"
-#include <Service/Bus.hpp>
-#include <cassert>
-#include <time/ScopedTime.hpp>
+#include <messages/DBServiceMessage.hpp> // for DBServiceResponseMessage, DBServiceMessageBackup
+#include <Service/Bus.hpp>               // for Bus
+#include <time/ScopedTime.hpp>           // for Scoped
+#include <inttypes.h>                    // for PRIu32
+#include <stdint.h>                      // for uint32_t
+#include <cassert>                       // for assert
+#include <optional>                      // for optional
+#include <utility>                       // for move
+#include <vector>                        // for vector
+
+#include "messages/DBSMSMessage.hpp" // for DBSMSResponseMessage, DBSMSMessage
+#include "messages/DBThreadMessage.hpp" // for DBThreadResponseMessage, DBThreadMessage, DBThreadGetCountMessage, DBThreadMessageGet
+#include "messages/DBNotificationMessage.hpp" // for NotificationMessage
+#include "messages/DBSettingsMessage.hpp"     // for DBSettingsResponseMessage, DBSettingsMessage
+#include "messages/DBSMSTemplateMessage.hpp"  // for DBSMSTemplateMessage, DBSMSTemplateResponseMessage
+#include "messages/DBContactMessage.hpp" // for DBContactMessage, DBContactResponseMessage, DBContactNumberResponseMessage, DBContactSearchMessage, DBContactBlock, DBContactNumberMessage
+#include "messages/DBAlarmMessage.hpp"   // for DBAlarmResponseMessage, DBAlarmMessage
+#include "messages/DBNotesMessage.hpp"   // for DBNotesResponseMessage, DBNotesMessage
+#include "messages/DBCalllogMessage.hpp" // for DBCalllogResponseMessage, DBCalllogMessage, DBCalllogGetCount
+#include "messages/DBCountryCodeMessage.hpp" // for DBCountryCodeResponseMessage, DBCountryCodeMessage
+#include "Database/Database.hpp"             // for Database
+#include "log/log.hpp"                       // for LOG_INFO, LOG_DEBUG, LOG_ERROR, LOG_FATAL
+#include "includes/DBServiceName.hpp"        // for db
+#include "messages/QueryMessage.hpp"         // for QueryMessage, QueryResponse
+#include "AlarmsRecord.hpp"                  // for AlarmsRecordInterface, AlarmsRecord
+#include "CalllogRecord.hpp"                 // for CalllogRecordInterface, CalllogRecord
+#include "ContactRecord.hpp" // for ContactRecord, ContactRecordInterface, ContactRecordInterface::ContactNumberMatch
+#include "CountryCodeRecord.hpp"         // for CountryCodeRecordInterface
+#include "Databases/AlarmsDB.hpp"        // for AlarmsDB
+#include "Databases/CalllogDB.hpp"       // for CalllogDB
+#include "Databases/ContactsDB.hpp"      // for ContactsDB
+#include "Databases/CountryCodesDB.hpp"  // for CountryCodesDB
+#include "Databases/EventsDB.hpp"        // for EventsDB
+#include "Databases/NotesDB.hpp"         // for NotesDB
+#include "Databases/NotificationsDB.hpp" // for NotificationsDB
+#include "Databases/SettingsDB.hpp"      // for SettingsDB
+#include "Databases/SmsDB.hpp"           // for SmsDB
+#include "EventsRecord.hpp"              // for EventsRecordInterface
+#include "MessageType.hpp" // for MessageType, MessageType::DBContactGetByID, MessageType::DBContactGetByNumber, MessageType::DBContactGetBySpeedDial, MessageType::DBContactGetLimitOffset, MessageType::DBAlarmAdd, MessageType::DBAlarmGetCount, MessageType::DBAlarmGetLimitOffset, MessageType::DBAlarmGetNext, MessageType::DBAlarmRemove, MessageType::DBAlarmUpdate, MessageType::DBCalllogAdd, MessageType::DBCalllogGetCount, MessageType::DBCalllogGetLimitOffset, MessageType::DBCalllogRemove, MessageType::DBCalllogUpdate, MessageType::DBContactAdd, MessageType::DBContactBlock, MessageType::DBContactGetByName, MessageType::DBContactGetCount, MessageType::DBContactMatchByNumber, MessageType::DBContactRemove, MessageType::DBContactSearch, MessageType::DBContactUpdate, MessageType::DBCountryCode, MessageType::DBNotesAdd, MessageType::DBNotesGetCount, MessageType::DBNotesGetLimitOffset, MessageType::DBNotesRemove, MessageType::DBNotesUpdate, MessageType::DBQuery, MessageType::DBSMSAdd, MessageType::DBSMSGetCount, MessageType::DBSMSGetLastRecord, MessageType::DBSMSGetSMSLimitOffset, MessageType::DBSMSGetSMSLimitOffsetByThreadID, MessageType::DBSMSRemove, MessageType::DBSMSTemplateAdd, MessageType::DBSMSTemplateGetCount, MessageType::DBSMSTemplateGetLimitOffset, MessageType::DBSMSTemplateRemove, MessageType::DBSMSTemplateUpdate, MessageType::DBSMSUpdate, MessageType::DBServiceBackup, MessageType::DBSettingsGet, MessageType::DBSettingsUpdate, MessageType::DBThreadGet, MessageType::DBThreadGetCount, MessageType::DBThreadGetForContact, MessageType::DBThreadGetLimitOffset, MessageType::DBThreadRemove, MessageType::DBThreadUpdate
+#include "NotesRecord.hpp" // for NotesRecordInterface
+#include "NotificationsRecord.hpp"  // for NotificationsRecordInterface
+#include "SMSRecord.hpp"            // for SMSRecord, SMSRecordInterface, SMSRecordField, SMSRecordField::ThreadID
+#include "SMSTemplateRecord.hpp"    // for SMSTemplateRecordInterface
+#include "SettingsRecord.hpp"       // for SettingsRecordInterface, SettingsRecord
+#include "SettingsRecord_v2.hpp"    // for SettingsRecordInterface_v2
+#include "Tables/Record.hpp"        // for DB_ID_NONE
+#include "ThreadRecord.hpp"         // for ThreadRecord, ThreadRecordInterface
+#include "agents/DatabaseAgent.hpp" // for DatabaseAgent
+#include "agents/settings/SettingsAgent.hpp" // for SettingsAgent
 
 static const auto service_db_stack = 1024 * 24;
 
diff --git a/module-services/service-db/ServiceDB.hpp b/module-services/service-db/ServiceDB.hpp
index 2bf440df07db2d36e8e4a52abf23e1b40b2ee6b3..f841a70a18505e02e9fe705b0fe0f13957bc9b94 100644
--- a/module-services/service-db/ServiceDB.hpp
+++ b/module-services/service-db/ServiceDB.hpp
@@ -3,6 +3,10 @@
 
 #pragma once
 
+#include <memory> // for unique_ptr
+#include <set>    // for set
+#include <string> // for string
+
 #include "Interface/AlarmsRecord.hpp"
 #include "Interface/CalllogRecord.hpp"
 #include "Interface/ContactRecord.hpp"
@@ -15,11 +19,37 @@
 #include "Interface/NotificationsRecord.hpp"
 #include "Interface/EventsRecord.hpp"
 #include "Interface/SettingsRecord_v2.hpp"
-#include "Service/Message.hpp"
-#include "Service/Service.hpp"
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
+#include "Service/Service.hpp" // for Service
 #include "messages/DBNotificationMessage.hpp"
 #include "agents/DatabaseAgent.hpp"
 #include "agents/settings/SettingsAgent.hpp"
+#include "BaseInterface.hpp"  // for Interface, Interface::Name
+#include "Common/Query.hpp"   // for Query, Query::Type
+#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
+
+class AlarmsDB;
+class AlarmsRecordInterface;
+class CalllogDB;
+class CalllogRecordInterface;
+class ContactRecordInterface;
+class ContactsDB;
+class CountryCodeRecordInterface;
+class CountryCodesDB;
+class DatabaseAgent;
+class EventsDB;
+class EventsRecordInterface;
+class NotesDB;
+class NotesRecordInterface;
+class NotificationsDB;
+class NotificationsRecordInterface;
+class SMSRecordInterface;
+class SMSTemplateRecordInterface;
+class SettingsDB;
+class SettingsRecordInterface;
+class SettingsRecordInterface_v2;
+class SmsDB;
+class ThreadRecordInterface;
 
 class ServiceDB : public sys::Service
 {
diff --git a/module-services/service-db/agents/DatabaseAgent.cpp b/module-services/service-db/agents/DatabaseAgent.cpp
index 8aa42d71d3334e4c5c3a724035aa297a8385c687..78ceca975484180b2517eff16bdc707ced8ed4ba 100644
--- a/module-services/service-db/agents/DatabaseAgent.cpp
+++ b/module-services/service-db/agents/DatabaseAgent.cpp
@@ -3,5 +3,10 @@
 
 #include "DatabaseAgent.hpp"
 
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 DatabaseAgent::DatabaseAgent(sys::Service *parentService) : parentService(parentService)
 {}
diff --git a/module-services/service-db/agents/DatabaseAgent.hpp b/module-services/service-db/agents/DatabaseAgent.hpp
index f26b2a5e19e53c9b639608d896ebaca531432bd4..b31de2986ec86a79bdefef7ccd829af2070e480b 100644
--- a/module-services/service-db/agents/DatabaseAgent.hpp
+++ b/module-services/service-db/agents/DatabaseAgent.hpp
@@ -3,12 +3,16 @@
 
 #pragma once
 
-#include <Database/Database.hpp>
+#include <Database/Database.hpp> // for Database
 #include <Service/Service.hpp>
-
-#include <string>
+#include <string> // for string
+#include <memory> // for unique_ptr
 
 class Database;
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 class DatabaseAgent
 {
diff --git a/module-services/service-db/agents/settings/Settings.cpp b/module-services/service-db/agents/settings/Settings.cpp
index ee8728eb29c269e0a170f48b2b219251ba0a8fcf..2c9a3f8c403d00f968b1dbb9c6e6297009114dc3 100644
--- a/module-services/service-db/agents/settings/Settings.cpp
+++ b/module-services/service-db/agents/settings/Settings.cpp
@@ -2,9 +2,16 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Settings.hpp"
-#include "messages/SettingsMessages.hpp"
-#include <Service/Service.hpp>
-#include <Service/Bus.hpp>
+
+#include <Service/Service.hpp> // for Service
+#include <Service/Bus.hpp>     // for Bus
+#include <utility>             // for move, pair
+#include <vector>              // for vector
+
+#include "messages/SettingsMessages.hpp" // for EntryPath, VariableChanged, CurrentModeChanged, CurrentProfileChanged, AddProfile, GetCurrentMode, GetCurrentProfile, GetVariable, ListModes, ListProfiles, RegisterOnModeChange, RegisterOnProfileChange, RegisterOnVariableChange, SetCurrentMode, SetCurrentProfile, SetVariable, UnregisterOnModeChange, UnregisterOnProfileChange, UnregisterOnVariableChange, VariableResponse, ModeListResponse, ModeResponse, ProfileListResponse, ProfileResponse, SettingsMessage (ptr only)
+#include "Service/Common.hpp" // for BusChannels, BusChannels::ServiceDBNotifications, ReturnCodes, ReturnCodes::Success
+#include "Service/Message.hpp" // for ResponseMessage, DataMessage, Message_t
+#include "log/log.hpp"         // for LOG_DEBUG, LOG_INFO, LOG_ERROR
 
 namespace Settings
 {
diff --git a/module-services/service-db/agents/settings/Settings.hpp b/module-services/service-db/agents/settings/Settings.hpp
index 6aa86c96c49f12dfed8ef7933bc0169b0ca5321e..e1162f9e5888260d948094265bf49eb5e1833252 100644
--- a/module-services/service-db/agents/settings/Settings.hpp
+++ b/module-services/service-db/agents/settings/Settings.hpp
@@ -3,18 +3,20 @@
 
 #pragma once
 
-#include <list>
-#include <functional>
-#include <map>
-#include <memory>
-#include <string>
-
-#include <includes/DBServiceName.hpp>
+#include <includes/DBServiceName.hpp> // for db
+#include <stdint.h>                   // for int16_t
+#include <list>                       // for list
+#include <functional>                 // for function
+#include <map>                        // for map
+#include <memory>                     // for shared_ptr, allocator
+#include <string>                     // for string
+#include <optional>                   // for optional
 
 namespace sys
 {
     class Service;
     class Message;
+
     using Message_t = std::shared_ptr<Message>;
 }; // namespace sys
 
diff --git a/module-services/service-db/agents/settings/SettingsAgent.cpp b/module-services/service-db/agents/settings/SettingsAgent.cpp
index 61d5a4e590a19177ab276ee9ed9afccaee035d57..af4705cccf8d564fb4c76982328c2924f785b60b 100644
--- a/module-services/service-db/agents/settings/SettingsAgent.cpp
+++ b/module-services/service-db/agents/settings/SettingsAgent.cpp
@@ -1,14 +1,17 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SettingsAgent.hpp"
 
-#include <module-sys/Service/Bus.hpp>
-#include <module-vfs/vfs.hpp>
+#include <module-sys/Service/Bus.hpp> // for Bus
+#include <module-vfs/vfs.hpp>         // for USER_PATH
+#include <memory>                     // for make_shared, allocator, shared_ptr, make_unique, unique_ptr
+#include <functional>                 // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
+#include <utility>                    // for move
 
-#include <log/log.hpp>
-
-#include <memory>
+#include "Database/Database.hpp"         // for Database
+#include "Service/Service.hpp"           // for Service
+#include "messages/SettingsMessages.hpp" // for SetVariable, GetVariable, VariableChanged, VariableResponse, EntryPath
 
 SettingsAgent::SettingsAgent(sys::Service *parentService) : DatabaseAgent(parentService)
 {
diff --git a/module-services/service-db/agents/settings/SettingsAgent.hpp b/module-services/service-db/agents/settings/SettingsAgent.hpp
index 7d22cc33a21906231c2822cb43c8b956146843e6..c937355c7065a4df0b4c6976e637b18632c93700 100644
--- a/module-services/service-db/agents/settings/SettingsAgent.hpp
+++ b/module-services/service-db/agents/settings/SettingsAgent.hpp
@@ -3,8 +3,21 @@
 
 #pragma once
 
+#include <optional> // for optional
+#include <string>   // for string
+
 #include "messages/SettingsMessages.hpp"
-#include "agents/DatabaseAgent.hpp"
+#include "agents/DatabaseAgent.hpp" // for DatabaseAgent
+#include "Service/Message.hpp"      // for DataMessage (ptr only), Message_t, ResponseMessage (ptr only)
+
+namespace Settings
+{
+    struct EntryPath;
+} // namespace Settings
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 class SettingsAgent : public DatabaseAgent
 {
diff --git a/module-services/service-db/api/DBServiceAPI.cpp b/module-services/service-db/api/DBServiceAPI.cpp
index 16b0f9d3791aa11e67dc4084c6b790fa14f08fb8..25af31bf262ffac89458cbcd70b7a7ea5f1dafea 100644
--- a/module-services/service-db/api/DBServiceAPI.cpp
+++ b/module-services/service-db/api/DBServiceAPI.cpp
@@ -3,28 +3,46 @@
 
 #include "DBServiceAPI.hpp"
 
-#include <messages/DBThreadMessage.hpp>
-#include <messages/DBSettingsMessage.hpp>
-#include <messages/DBSMSMessage.hpp>
-#include <messages/DBSMSTemplateMessage.hpp>
-#include <messages/DBContactMessage.hpp>
-#include <messages/DBAlarmMessage.hpp>
-#include <messages/DBNotesMessage.hpp>
-#include <messages/DBCalllogMessage.hpp>
-#include <messages/DBCountryCodeMessage.hpp>
-#include <messages/DBServiceMessage.hpp>
-#include <messages/QueryMessage.hpp>
-
-#include <Common/Query.hpp>
-#include <queries/phonebook/QueryNumberGetByID.hpp>
-#include <queries/messages/threads/QueryThreadGetByNumber.hpp>
-
-#include <ServiceDB.hpp>
-#include <includes/DBServiceName.hpp>
-
-#include <Utils.hpp>
-
-#include <cassert>
+#include <messages/DBThreadMessage.hpp> // for DBThreadMessage, DBThreadResponseMessage, DBThreadGetCountMessage, DBThreadMessageGet
+#include <messages/DBSettingsMessage.hpp> // for DBSettingsMessage, DBSettingsResponseMessage
+#include <messages/DBSMSMessage.hpp>      // for DBSMSMessage, DBSMSResponseMessage, DBSMSGetCount
+#include <messages/DBSMSTemplateMessage.hpp> // for DBSMSTemplateMessage, DBSMSTemplateResponseMessage, DBSMSTemplateGetCount
+#include <messages/DBContactMessage.hpp> // for DBContactMessage, DBContactResponseMessage, DBContactBlock, DBContactNumberMessage, DBContactSearchMessage, DBContactNumberResponseMessage
+#include <messages/DBAlarmMessage.hpp>   // for DBAlarmMessage, DBAlarmResponseMessage
+#include <messages/DBNotesMessage.hpp>   // for DBNotesMessage, DBNotesResponseMessage
+#include <messages/DBCalllogMessage.hpp> // for DBCalllogMessage, DBCalllogResponseMessage, DBCalllogGetCount
+#include <messages/DBCountryCodeMessage.hpp>                   // for DBCountryCodeMessage, DBCountryCodeResponseMessage
+#include <messages/DBServiceMessage.hpp>                       // for DBServiceMessageBackup
+#include <messages/QueryMessage.hpp>                           // for QueryResponse
+#include <Common/Query.hpp>                                    // for Query, QueryResult
+#include <queries/phonebook/QueryNumberGetByID.hpp>            // for NumberGetByID, NumberGetByIDResult
+#include <queries/messages/threads/QueryThreadGetByNumber.hpp> // for ThreadGetByNumber, ThreadGetByNumberResult
+#include <includes/DBServiceName.hpp>                          // for db
+#include <Utils.hpp>                                           // for to_string
+#include <ext/alloc_traits.h>                                  // for __alloc_traits<>::value_type
+#include <cassert>                                             // for assert
+#include <utility>                                             // for pair, move, tuple_element<>::type
+
+#include "AlarmsRecord.hpp"  // for AlarmsRecord
+#include "CalllogRecord.hpp" // for CalllogRecord, operator<<
+#include "ContactRecord.hpp" // for ContactRecord, ContactRecord::Number
+#include "MessageType.hpp" // for MessageType, MessageType::DBContactGetByID, MessageType::DBAlarmAdd, MessageType::DBAlarmGetCount, MessageType::DBAlarmGetLimitOffset, MessageType::DBAlarmGetNext, MessageType::DBAlarmRemove, MessageType::DBAlarmUpdate, MessageType::DBCalllogAdd, MessageType::DBCalllogGetLimitOffset, MessageType::DBCalllogRemove, MessageType::DBCalllogUpdate, MessageType::DBContactAdd, MessageType::DBContactBlock, MessageType::DBContactGetByName, MessageType::DBContactGetByNumber, MessageType::DBContactGetBySpeedDial, MessageType::DBContactGetCount, MessageType::DBContactGetLimitOffset, MessageType::DBContactRemove, MessageType::DBContactSearch, MessageType::DBContactUpdate, MessageType::DBCountryCode, MessageType::DBNotesAdd, MessageType::DBNotesGetCount, MessageType::DBNotesGetLimitOffset, MessageType::DBNotesRemove, MessageType::DBNotesUpdate, MessageType::DBSMSAdd, MessageType::DBSMSGetLastRecord, MessageType::DBSMSGetSMSLimitOffset, MessageType::DBSMSGetSMSLimitOffsetByThreadID, MessageType::DBSMSRemove, MessageType::DBSMSTemplateAdd, MessageType::DBSMSTemplateGetLimitOffset, MessageType::DBSMSTemplateRemove, MessageType::DBSMSTemplateUpdate, MessageType::DBSMSUpdate, MessageType::DBServiceBackup, MessageType::DBSettingsGet, MessageType::DBSettingsUpdate, MessageType::DBThreadGet, MessageType::DBThreadGetForContact, MessageType::DBThreadGetLimitOffset, MessageType::DBThreadRemove, MessageType::DBThreadUpdate
+#include "PhoneNumber.hpp" // for PhoneNumber::View, PhoneNumber
+#include "SMSRecord.hpp"   // for SMSRecord
+#include "SMSTemplateRecord.hpp"        // for SMSTemplateRecord
+#include "Service/Bus.hpp"              // for Bus
+#include "Service/Common.hpp"           // for ReturnCodes, ReturnCodes::Success, c_str
+#include "SettingsRecord.hpp"           // for SettingsRecord
+#include "Tables/CountryCodesTable.hpp" // for CodesTableRow
+#include "Tables/Record.hpp"            // for DB_ID_NONE
+#include "ThreadRecord.hpp"             // for ThreadRecord
+#include "log/log.hpp"                  // for LOG_DEBUG, LOG_ERROR, LOG_INFO
+
+namespace sys
+{
+    class Service;
+} // namespace sys
+struct NotesRecord;
 
 SettingsRecord DBServiceAPI::SettingsGet(sys::Service *serv)
 {
diff --git a/module-services/service-db/api/DBServiceAPI.hpp b/module-services/service-db/api/DBServiceAPI.hpp
index 544ce1aefb1cf81839731101ed725bccf374b230..cb3fc4c39494df0cfcd0d41cd5d3266e1d809ced 100644
--- a/module-services/service-db/api/DBServiceAPI.hpp
+++ b/module-services/service-db/api/DBServiceAPI.hpp
@@ -3,23 +3,40 @@
 
 #pragma once
 
-#include "Interface/AlarmsRecord.hpp"
-#include "Interface/CalllogRecord.hpp"
+#include <Common/Query.hpp>
+#include <PhoneNumber.hpp>     // for PhoneNumber
+#include <Service/Message.hpp> // for MessageRet_t
+#include <stdint.h>            // for uint32_t
+#include <sys/types.h>         // for time_t
+#include <memory>              // for unique_ptr, shared_ptr
+#include <string>              // for string
+#include <vector>              // for vector
+
+#include "Interface/AlarmsRecord.hpp"  // for AlarmsRecord
+#include "Interface/CalllogRecord.hpp" // for CalllogRecord
 #include "Interface/ContactRecord.hpp"
 #include "Interface/NotesRecord.hpp"
-#include "Interface/SMSRecord.hpp"
-#include "Interface/SettingsRecord.hpp"
-#include "Interface/ThreadRecord.hpp"
-#include "Interface/SMSTemplateRecord.hpp"
+#include "Interface/SMSRecord.hpp"         // for SMSRecord
+#include "Interface/SettingsRecord.hpp"    // for SettingsRecord
+#include "Interface/ThreadRecord.hpp"      // for ThreadRecord
+#include "Interface/SMSTemplateRecord.hpp" // for SMSTemplateRecord
 #include "Service/Bus.hpp"
 #include "Interface/SettingsRecord_v2.hpp"
-
-#include <Common/Query.hpp>
-#include <PhoneNumber.hpp>
-
-#include <Service/Message.hpp>
+#include "BaseInterface.hpp" // for Interface, Interface::Name
+#include "Common/Common.hpp" // for EntryState, EntryState::ALL
+#include "utf8/UTF8.hpp"     // for UTF8
 
 class DBContactMessage;
+namespace db
+{
+    class Query;
+} // namespace db
+namespace sys
+{
+    class Service;
+} // namespace sys
+struct ContactRecord;
+struct NotesRecord;
 
 class DBServiceAPI
 {
diff --git a/module-services/service-db/api/DBServiceAPI_GetByQuery.cpp b/module-services/service-db/api/DBServiceAPI_GetByQuery.cpp
index 6a3f6b5fb8952b0542bb2d4b2b555e09f3168f9d..8e4b78a1918020e601a3e9155e5bf6611363ed58 100644
--- a/module-services/service-db/api/DBServiceAPI_GetByQuery.cpp
+++ b/module-services/service-db/api/DBServiceAPI_GetByQuery.cpp
@@ -1,13 +1,25 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "DBServiceAPI.hpp"
+#include <includes/DBServiceName.hpp> // for db
+#include <messages/QueryMessage.hpp>  // for QueryMessage
+#include <Service/Message.hpp>        // for MessageRet_t
+#include <stdint.h>                   // for uint32_t
+#include <utility>                    // for move
+#include <memory>                     // for make_shared, allocator, unique_ptr
 
-#include <includes/DBServiceName.hpp>
-#include <messages/QueryMessage.hpp>
-#include <Service/Message.hpp>
+#include "DBServiceAPI.hpp"  // for DBServiceAPI
+#include "BaseInterface.hpp" // for Interface, Interface::Name
+#include "Service/Bus.hpp"   // for Bus
 
-#include <utility>
+namespace db
+{
+    class Query;
+} // namespace db
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 bool DBServiceAPI::GetQuery(sys::Service *serv, db::Interface::Name database, std::unique_ptr<db::Query> query)
 {
diff --git a/module-services/service-db/messages/DBAlarmMessage.cpp b/module-services/service-db/messages/DBAlarmMessage.cpp
index eec3c7452e0b4efa2ee23e5762850e48557e3ec5..167f4f213de39cdd4a359eff29523bb22777efaf 100644
--- a/module-services/service-db/messages/DBAlarmMessage.cpp
+++ b/module-services/service-db/messages/DBAlarmMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBAlarmMessage.hpp"
 
+#include <utility> // for move
+
+#include "AlarmsRecord.hpp"       // for AlarmsRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBAlarmMessage ::DBAlarmMessage(MessageType messageType, const AlarmsRecord &rec) : DBMessage(messageType), record(rec)
 {}
 
diff --git a/module-services/service-db/messages/DBAlarmMessage.hpp b/module-services/service-db/messages/DBAlarmMessage.hpp
index f45c4af04dc97016d62d127b611d399031b58150..de3a2b596e9f211bc7c231e34b2589a7990e64d9 100644
--- a/module-services/service-db/messages/DBAlarmMessage.hpp
+++ b/module-services/service-db/messages/DBAlarmMessage.hpp
@@ -3,8 +3,14 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/AlarmsRecord.hpp"
+#include <stdint.h>    // for uint32_t
+#include <sys/types.h> // for time_t
+#include <memory>      // for unique_ptr
+#include <vector>      // for vector
+
+#include "DBMessage.hpp"              // for DBMessage, DBResponseMessage
+#include "Interface/AlarmsRecord.hpp" // for AlarmsRecord
+#include "MessageType.hpp"            // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBAlarmMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBCalllogMessage.cpp b/module-services/service-db/messages/DBCalllogMessage.cpp
index cdb7fcc6e01927de5af1d7df19298df616941a7d..7a8c223c80af4fb8eb162a1ff6553e096cd99aea 100644
--- a/module-services/service-db/messages/DBCalllogMessage.cpp
+++ b/module-services/service-db/messages/DBCalllogMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBCalllogMessage.hpp"
 
+#include <utility> // for move
+
+#include "CalllogRecord.hpp"      // for CalllogRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBCalllogMessage::DBCalllogMessage(MessageType messageType, const CalllogRecord &rec)
     : DBMessage(messageType), record(rec)
 {}
diff --git a/module-services/service-db/messages/DBCalllogMessage.hpp b/module-services/service-db/messages/DBCalllogMessage.hpp
index 1a3bcb6f88f1f8bbc1cfdda3522635567125b812..42e16b56dcb5ad6a5f191cc4752b88236622b95a 100644
--- a/module-services/service-db/messages/DBCalllogMessage.hpp
+++ b/module-services/service-db/messages/DBCalllogMessage.hpp
@@ -3,8 +3,14 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/CalllogRecord.hpp"
+#include <stdint.h> // for uint32_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "DBMessage.hpp"               // for DBMessage, DBResponseMessage
+#include "Interface/CalllogRecord.hpp" // for CalllogRecord
+#include "Common/Common.hpp"           // for EntryState
+#include "MessageType.hpp"             // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBCalllogMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBContactMessage.cpp b/module-services/service-db/messages/DBContactMessage.cpp
index 2003df9a65c068c96744d5cf5d24d92ec436fa44..c64246bdb40cbc2df7dd5233c16834f641672391 100644
--- a/module-services/service-db/messages/DBContactMessage.cpp
+++ b/module-services/service-db/messages/DBContactMessage.cpp
@@ -2,10 +2,14 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "DBContactMessage.hpp"
-#include "MessageType.hpp"
 
-#include <memory>
-#include <utility>
+#include <memory>  // for unique_ptr
+#include <utility> // for move
+
+#include "MessageType.hpp"        // for MessageType, MessageType::DBContactMatchByNumber
+#include "ContactRecord.hpp"      // for ContactRecord
+#include "PhoneNumber.hpp"        // for PhoneNumber
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
 
 DBContactMessage ::DBContactMessage(MessageType messageType, const ContactRecord &rec, bool favourite)
     : DBMessage(messageType), record(rec), favourite{favourite}
diff --git a/module-services/service-db/messages/DBContactMessage.hpp b/module-services/service-db/messages/DBContactMessage.hpp
index 08867c5bbef2e6c1295a00c1db1a74d2457f451f..9f1715919a9ba1f5950668e4369388c4a9641547 100644
--- a/module-services/service-db/messages/DBContactMessage.hpp
+++ b/module-services/service-db/messages/DBContactMessage.hpp
@@ -3,16 +3,17 @@
 
 #pragma once
 
-#include "MessageType.hpp"
-
-#include "DBMessage.hpp"
-#include "Interface/ContactRecord.hpp"
-#include "Service/Message.hpp"
-
-#include <PhoneNumber.hpp>
-
-#include <memory>
+#include <PhoneNumber.hpp> // for PhoneNumber, PhoneNumber::View
+#include <stdint.h>        // for uint32_t
+#include <memory>          // for unique_ptr
 #include <utility>
+#include <vector> // for vector
+
+#include "MessageType.hpp"             // for MessageType, MessageType::MessageTypeUninitialized
+#include "DBMessage.hpp"               // for DBMessage, DBResponseMessage
+#include "Interface/ContactRecord.hpp" // for ContactRecord
+#include "Service/Message.hpp"         // for DataMessage, ResponseMessage
+#include "Service/Common.hpp"          // for ReturnCodes
 
 class DBContactMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBCountryCodeMessage.cpp b/module-services/service-db/messages/DBCountryCodeMessage.cpp
index 09156ff9baae5ea586d676ac3e8ac7f26b3ff6ec..391d301e6eba4cecf885ab7ab8d54ea5b252f8ee 100644
--- a/module-services/service-db/messages/DBCountryCodeMessage.cpp
+++ b/module-services/service-db/messages/DBCountryCodeMessage.cpp
@@ -3,6 +3,8 @@
 
 #include "DBCountryCodeMessage.hpp"
 
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBCountryCodeMessage::DBCountryCodeMessage(MessageType messageType, const uint32_t _mcc, const uint32_t _country_code)
     : DBMessage(messageType), mcc(_mcc), country_code(_country_code)
 {}
diff --git a/module-services/service-db/messages/DBCountryCodeMessage.hpp b/module-services/service-db/messages/DBCountryCodeMessage.hpp
index 229a5b7e604e184654c127018fc9e91ba132d625..a65647ee412f3312ca6840835867dbe6bd4185d7 100644
--- a/module-services/service-db/messages/DBCountryCodeMessage.hpp
+++ b/module-services/service-db/messages/DBCountryCodeMessage.hpp
@@ -3,8 +3,12 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
+#include <stdint.h> // for uint32_t
+
+#include "DBMessage.hpp" // for DBMessage, DBResponseMessage
 #include "Interface/CountryCodeRecord.hpp"
+#include "MessageType.hpp"              // for MessageType, MessageType::MessageTypeUninitialized
+#include "Tables/CountryCodesTable.hpp" // for CodesTableRow
 
 class DBCountryCodeMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBNotesMessage.cpp b/module-services/service-db/messages/DBNotesMessage.cpp
index d8c5254aac4b555b14ba913a556785f6e1ce19cf..e0d2a3479b01798fa8d21c5adfda13acffe6797e 100644
--- a/module-services/service-db/messages/DBNotesMessage.cpp
+++ b/module-services/service-db/messages/DBNotesMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBNotesMessage.hpp"
 
+#include <utility> // for move
+
+#include "NotesRecord.hpp"        // for NotesRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBNotesMessage::DBNotesMessage(MessageType messageType, const NotesRecord &rec) : DBMessage(messageType), record(rec)
 {}
 
diff --git a/module-services/service-db/messages/DBNotesMessage.hpp b/module-services/service-db/messages/DBNotesMessage.hpp
index 75639f289e638de383c8f62d1aabc1f0d36b3ffb..f4b64f65699f4b8a4aff1bdea187c31145c471c7 100644
--- a/module-services/service-db/messages/DBNotesMessage.hpp
+++ b/module-services/service-db/messages/DBNotesMessage.hpp
@@ -3,8 +3,13 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/NotesRecord.hpp"
+#include <stdint.h> // for uint32_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "DBMessage.hpp"             // for DBMessage, DBResponseMessage
+#include "Interface/NotesRecord.hpp" // for NotesRecord
+#include "MessageType.hpp"           // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBNotesMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBNotificationMessage.cpp b/module-services/service-db/messages/DBNotificationMessage.cpp
index f4b413a25a57481b5abd745897c8b82f8c6c1d03..2253bd1648912c77b556f70bae3e311d4d1f2cba 100644
--- a/module-services/service-db/messages/DBNotificationMessage.cpp
+++ b/module-services/service-db/messages/DBNotificationMessage.cpp
@@ -3,6 +3,10 @@
 
 #include "DBNotificationMessage.hpp"
 
+#include "BaseInterface.hpp" // for Interface, Interface::Name
+#include "Common/Query.hpp"  // for Query, Query::Type, Query::Type::Create, Query::Type::Delete, Query::Type::Update
+#include "MessageType.hpp"   // for MessageType, MessageType::DBServiceNotification
+
 namespace db
 {
     NotificationMessage::NotificationMessage(db::Interface::Name interface, Query::Type type)
diff --git a/module-services/service-db/messages/DBNotificationMessage.hpp b/module-services/service-db/messages/DBNotificationMessage.hpp
index 1189ba36de65d7141b98610a17ae99a1d74070d5..7cd0c62c1f4825d6cfd98254fe8b9a2d4acf2463 100644
--- a/module-services/service-db/messages/DBNotificationMessage.hpp
+++ b/module-services/service-db/messages/DBNotificationMessage.hpp
@@ -3,11 +3,12 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Service/Message.hpp"
+#include <module-db/Interface/BaseInterface.hpp> // for Interface, Interface::Name
+#include <module-db/Common/Query.hpp>            // for Query, Query::Type
 #include <memory>
-#include <module-db/Interface/BaseInterface.hpp>
-#include <module-db/Common/Query.hpp>
+
+#include "DBMessage.hpp"
+#include "Service/Message.hpp" // for DataMessage
 
 namespace db
 {
diff --git a/module-services/service-db/messages/DBSMSMessage.cpp b/module-services/service-db/messages/DBSMSMessage.cpp
index b2537c65772b210ee4085c315a74bbba34265a32..2cc0fbe3bdb14aba76bb89e6dc8c23beeda5ac4d 100644
--- a/module-services/service-db/messages/DBSMSMessage.cpp
+++ b/module-services/service-db/messages/DBSMSMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBSMSMessage.hpp"
 
+#include <utility> // for move
+
+#include "SMSRecord.hpp"          // for SMSRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBSMSMessage::DBSMSMessage(MessageType messageType, const SMSRecord &rec) : DBMessage(messageType), record(rec)
 {}
 
diff --git a/module-services/service-db/messages/DBSMSMessage.hpp b/module-services/service-db/messages/DBSMSMessage.hpp
index 722fe9160a51944f574e9ee4d6865da24204d915..6947547c082b7152560fb23c05536b1febfd5e63 100644
--- a/module-services/service-db/messages/DBSMSMessage.hpp
+++ b/module-services/service-db/messages/DBSMSMessage.hpp
@@ -3,8 +3,13 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/SMSRecord.hpp"
+#include <stdint.h> // for uint32_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "DBMessage.hpp"           // for DBMessage, DBResponseMessage
+#include "Interface/SMSRecord.hpp" // for SMSRecord
+#include "MessageType.hpp"         // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBSMSMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBSMSTemplateMessage.cpp b/module-services/service-db/messages/DBSMSTemplateMessage.cpp
index be8f2c3a6d72e9af52488381338a3ac21d987639..0dd17dfcd525bf8104e4cd5934e4dff41d7d10e9 100644
--- a/module-services/service-db/messages/DBSMSTemplateMessage.cpp
+++ b/module-services/service-db/messages/DBSMSTemplateMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBSMSTemplateMessage.hpp"
 
+#include <utility> // for move
+
+#include "SMSTemplateRecord.hpp"  // for SMSTemplateRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBSMSTemplateMessage::DBSMSTemplateMessage(MessageType messageType, const SMSTemplateRecord &rec)
     : DBMessage(messageType), record(rec)
 {}
diff --git a/module-services/service-db/messages/DBSMSTemplateMessage.hpp b/module-services/service-db/messages/DBSMSTemplateMessage.hpp
index e480b7d1e8d6a4e8aea3d739f16400a9d3e8f911..0f618ea626bacddd0916ac223145f1c139def3f5 100644
--- a/module-services/service-db/messages/DBSMSTemplateMessage.hpp
+++ b/module-services/service-db/messages/DBSMSTemplateMessage.hpp
@@ -3,8 +3,13 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/SMSTemplateRecord.hpp"
+#include <stdint.h> // for uint32_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "DBMessage.hpp"                   // for DBMessage, DBResponseMessage
+#include "Interface/SMSTemplateRecord.hpp" // for SMSTemplateRecord
+#include "MessageType.hpp"                 // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBSMSTemplateMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBServiceMessage.cpp b/module-services/service-db/messages/DBServiceMessage.cpp
index 325e29f12c5c93cf04c6e9be0575f43262f3f236..41cf7bf04336465f1f117f0ec13003d31094c5d4 100644
--- a/module-services/service-db/messages/DBServiceMessage.cpp
+++ b/module-services/service-db/messages/DBServiceMessage.cpp
@@ -3,6 +3,8 @@
 
 #include "DBServiceMessage.hpp"
 
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBServiceMessageBackup::DBServiceMessageBackup(MessageType messageType, std::string backupPath)
     : DBMessage(messageType), backupPath(backupPath)
 {}
diff --git a/module-services/service-db/messages/DBServiceMessage.hpp b/module-services/service-db/messages/DBServiceMessage.hpp
index 2a9f71f34f7e1c47aeba1071c694c5a7375fcd2f..494135f543e72ed0b75ef96ca1fc4ff70e63c1b8 100644
--- a/module-services/service-db/messages/DBServiceMessage.hpp
+++ b/module-services/service-db/messages/DBServiceMessage.hpp
@@ -3,7 +3,11 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
+#include <stdint.h> // for uint32_t
+#include <string>   // for string
+
+#include "DBMessage.hpp"   // for DBMessage, DBResponseMessage
+#include "MessageType.hpp" // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBServiceMessageBackup : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBSettingsMessage.cpp b/module-services/service-db/messages/DBSettingsMessage.cpp
index b518c397fe5975fcc090edc859825b7354ab27d1..1a49803dc854cfa7a34e876a78e3fabe634be532 100644
--- a/module-services/service-db/messages/DBSettingsMessage.cpp
+++ b/module-services/service-db/messages/DBSettingsMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBSettingsMessage.hpp"
 
+#include "SettingsRecord_v2.hpp"  // for SettingsRecord_v2
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
+struct SettingsRecord;
+
 DBSettingsMessage::DBSettingsMessage(MessageType messageType, const SettingsRecord &rec)
     : DBMessage(messageType), record(rec)
 {}
diff --git a/module-services/service-db/messages/DBSettingsMessage.hpp b/module-services/service-db/messages/DBSettingsMessage.hpp
index 7edfff5349e0c07b63da2a4599a2cc1c585534d2..0445d3f4a7ce76640b785a61025915d3f0f68516 100644
--- a/module-services/service-db/messages/DBSettingsMessage.hpp
+++ b/module-services/service-db/messages/DBSettingsMessage.hpp
@@ -3,9 +3,13 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/SettingsRecord.hpp"
-#include "Interface/SettingsRecord_v2.hpp"
+#include <stdint.h> // for uint32_t
+#include <string>   // for string
+
+#include "DBMessage.hpp"                   // for DBMessage, DBResponseMessage
+#include "Interface/SettingsRecord.hpp"    // for SettingsRecord
+#include "Interface/SettingsRecord_v2.hpp" // for SettingsRecord_v2
+#include "MessageType.hpp"                 // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBSettingsMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/DBThreadMessage.cpp b/module-services/service-db/messages/DBThreadMessage.cpp
index 627115e541f8837f0f1ea9414c8602db60439384..22925ff2668909a8e9a887865f7b9d77efab3234 100644
--- a/module-services/service-db/messages/DBThreadMessage.cpp
+++ b/module-services/service-db/messages/DBThreadMessage.cpp
@@ -3,6 +3,11 @@
 
 #include "DBThreadMessage.hpp"
 
+#include <utility> // for move
+
+#include "ThreadRecord.hpp"       // for ThreadRecord
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
+
 DBThreadMessage::DBThreadMessage(MessageType messageType, const ThreadRecord &rec) : DBMessage(messageType), record(rec)
 {}
 
diff --git a/module-services/service-db/messages/DBThreadMessage.hpp b/module-services/service-db/messages/DBThreadMessage.hpp
index 0c02e697564aa4da208b16d5fda47f47b0766660..ed805b0e840a750ad17d1cf7b3219e0e114f14f6 100644
--- a/module-services/service-db/messages/DBThreadMessage.hpp
+++ b/module-services/service-db/messages/DBThreadMessage.hpp
@@ -3,8 +3,14 @@
 
 #pragma once
 
-#include "DBMessage.hpp"
-#include "Interface/ThreadRecord.hpp"
+#include <stdint.h> // for uint32_t
+#include <memory>   // for unique_ptr
+#include <vector>   // for vector
+
+#include "DBMessage.hpp"              // for DBMessage, DBResponseMessage
+#include "Interface/ThreadRecord.hpp" // for ThreadRecord
+#include "Common/Common.hpp"          // for EntryState, EntryState::ALL
+#include "MessageType.hpp"            // for MessageType, MessageType::MessageTypeUninitialized
 
 class DBThreadMessage : public DBMessage
 {
diff --git a/module-services/service-db/messages/QueryMessage.cpp b/module-services/service-db/messages/QueryMessage.cpp
index d57ff0210e57799a20cff913437bd0b53d2e69c8..556c5a3b658c099e4b05d938c84dd0b6546620eb 100644
--- a/module-services/service-db/messages/QueryMessage.cpp
+++ b/module-services/service-db/messages/QueryMessage.cpp
@@ -3,8 +3,14 @@
 
 #include "QueryMessage.hpp"
 
-#include <memory>
-#include <stdexcept>
+#include <memory>    // for unique_ptr, operator==
+#include <stdexcept> // for runtime_error
+#include <utility>   // for move
+
+#include "BaseInterface.hpp"      // for Interface, Interface::Name
+#include "Common/Query.hpp"       // for Query, QueryResult
+#include "MessageType.hpp"        // for MessageType, MessageType::DBQuery
+#include "messages/DBMessage.hpp" // for DBMessage, DBResponseMessage
 
 namespace db
 {
diff --git a/module-services/service-db/test/test-service-db-api.cpp b/module-services/service-db/test/test-service-db-api.cpp
index 726e5dfbf0f63ea7eab1e4ca3acc28f292defd0a..3a9f0ff6270fb75fc13b1e684def638790ab8ef6 100644
--- a/module-services/service-db/test/test-service-db-api.cpp
+++ b/module-services/service-db/test/test-service-db-api.cpp
@@ -1,9 +1,12 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <catch2/catch.hpp>
-#include <module-db/Interface/ContactRecord.hpp>
-#include <module-services/service-db/api/DBServiceAPI.hpp>
+#include <catch2/catch.hpp> // for AssertionHandler, operator""_catch_sr, SourceLineInfo, StringRef, REQUIRE, Section, SECTION, SectionInfo, TEST_CASE
+#include <module-db/Interface/ContactRecord.hpp> // for ContactRecord
+#include <module-services/service-db/api/DBServiceAPI.hpp> // for DBServiceAPI, DBServiceAPI::noError, DBServiceAPI::ContactVerificationError, DBServiceAPI::emptyContactError
+#include <memory> // for allocator
+
+#include "utf8/UTF8.hpp" // for UTF8
 
 TEST_CASE("DB_API")
 {
diff --git a/module-services/service-db/test/test-service-db-settings-api.cpp b/module-services/service-db/test/test-service-db-settings-api.cpp
index 579d5aa791f1e42673ffbb8cfec734c2bd32adef..e7ee211dbdaf8a57f65189a184df1f49010d0363 100644
--- a/module-services/service-db/test/test-service-db-settings-api.cpp
+++ b/module-services/service-db/test/test-service-db-settings-api.cpp
@@ -1,11 +1,19 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <catch2/catch.hpp>
-#include "agents/settings/Settings.hpp"
-#include "messages/SettingsMessages.hpp"
-#include <Service/Service.hpp>
-#include <functional>
+#include <catch2/catch.hpp> // for AssertionHandler, SourceLineInfo, operator""_catch_sr, Section, StringRef, REQUIRE, SECTION, SectionInfo, TEST_CASE
+#include <Service/Service.hpp> // for Service
+#include <functional>          // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
+#include <map>                 // for operator!=, _Rb_tree_iterator, map<>::iterator, map<>::mapped_type, map
+#include <memory>              // for shared_ptr, allocator, make_shared, operator==, __shared_ptr_access
+#include <optional>            // for optional
+#include <string>              // for string, operator==, basic_string
+
+#include "agents/settings/Settings.hpp"  // for Settings
+#include "messages/SettingsMessages.hpp" // for SetVariable, VariableResponse, GetVariable, EntryPath, VariableChanged
+#include "Service/Common.hpp"            // for ReturnCodes, ReturnCodes::Success, ServicePowerMode
+#include "Service/Mailbox.hpp"           // for Mailbox
+#include "Service/Message.hpp"           // for Message_t, ResponseMessage, DataMessage, Message
 
 namespace Settings
 {
diff --git a/module-services/service-db/test/test-service-db-settings-messages.cpp b/module-services/service-db/test/test-service-db-settings-messages.cpp
index 92d6d8cc8dfb1136441e4ee93bf4adcd95396d8c..cb79d141e3e45a4a9fe98609785a4628958a282f 100644
--- a/module-services/service-db/test/test-service-db-settings-messages.cpp
+++ b/module-services/service-db/test/test-service-db-settings-messages.cpp
@@ -1,14 +1,19 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <catch2/catch.hpp>
-#include "messages/SettingsMessages.hpp"
-
-#include <Service/Service.hpp>
-#include <Service/Message.hpp>
-
-#include <functional>
-#include <module-sys/Service/Bus.hpp>
+#include <catch2/catch.hpp>           // for Section, SourceLineInfo, SECTION, SectionInfo, StringRef, TEST_CASE
+#include <Service/Service.hpp>        // for Service
+#include <Service/Message.hpp>        // for Message_t, ResponseMessage, DataMessage
+#include <module-sys/Service/Bus.hpp> // for Bus
+#include <functional>                 // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
+#include <list>                       // for list
+#include <memory>                     // for make_shared, allocator, shared_ptr
+#include <optional>                   // for optional
+#include <string>                     // for string
+#include <utility>                    // for move
+
+#include "messages/SettingsMessages.hpp" // for SetVariable, ListProfiles, GetVariable, AddMode, AddProfile, CurrentModeChanged, CurrentProfileChanged, EntryPath, GetCurrentMode, GetCurrentProfile, ListModes, ModeListResponse, ProfileListResponse, RegisterOnVariableChange, UnregisterOnVariableChange, VariableChanged, VariableResponse
+#include "Service/Common.hpp"            // for ReturnCodes, ReturnCodes::Success, ServicePowerMode
 
 namespace Settings
 {
diff --git a/module-services/service-desktop/ServiceDesktop.cpp b/module-services/service-desktop/ServiceDesktop.cpp
index 43b03ebc10dc774b59438ffb194fe08b2a596c15..93abd6738c11a47a13af1092bdd574da55d051df 100644
--- a/module-services/service-desktop/ServiceDesktop.cpp
+++ b/module-services/service-desktop/ServiceDesktop.cpp
@@ -1,13 +1,25 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <messages/QueryMessage.hpp>
-#include <module-apps/application-desktop/ApplicationDesktop.hpp>
-#include "ServiceDesktop.hpp"
-#include "BackupRestore.hpp"
-#include "DesktopMessages.hpp"
-#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp"
-#include "log/log.hpp"
+#include <messages/QueryMessage.hpp>                              // for QueryResponse
+#include <module-apps/application-desktop/ApplicationDesktop.hpp> // for name_desktop
+#include <module-services/service-desktop/ServiceDesktop.hpp>
+#include <inttypes.h> // for PRIu32
+#include <filesystem> // for path
+
+#include "ServiceDesktop.hpp" // for ServiceDesktop, cdc_queue_len, cdc_queue_object_size, service_desktop, service_stack
+#include "BackupRestore.hpp"  // for BackupRestore
+#include "DesktopMessages.hpp" // for UpdateOsMessage, BackupMessage, FactoryMessage, RestoreMessage
+#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp" // for Run
+#include "log/log.hpp"                                                             // for LOG_DEBUG, LOG_INFO, LOG_ERROR
+#include "Common/Query.hpp"                                                        // for QueryResult
+#include "MessageType.hpp"    // for MessageType, MessageType::DBQuery
+#include "Service/Bus.hpp"    // for Bus
+#include "Service/Worker.hpp" // for WorkerQueueInfo
+#include "UpdateMuditaOS.hpp" // for UpdateMuditaOS, UpdateStats, UpdateMessageType, UpdateError, UpdateError::NoError, UpdateMessageType::UpdateCheckForUpdateOnce, UpdateMessageType::UpdateFoundOnBoot, UpdateMessageType::UpdateNow
+#include "WorkerDesktop.hpp"  // for WorkerDesktop
+#include "json/json11.hpp"    // for Json
+#include "vfs.hpp"            // for vfs
 
 ServiceDesktop::ServiceDesktop() : sys::Service(service::name::service_desktop, "", sdesktop::service_stack)
 {
diff --git a/module-services/service-desktop/ServiceDesktop.hpp b/module-services/service-desktop/ServiceDesktop.hpp
index 1044fc1c4f28eda0c401bd8e363f1e276fadb4a3..2029dac36f17857cff178f92dedb5cab899cfbb9 100644
--- a/module-services/service-desktop/ServiceDesktop.hpp
+++ b/module-services/service-desktop/ServiceDesktop.hpp
@@ -3,8 +3,17 @@
 
 #pragma once
 
+#include <memory> // for allocator, unique_ptr
+#include <string> // for string
+
 #include "WorkerDesktop.hpp"
 #include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp"
+#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
+#include "Service/Service.hpp" // for Service
+
+class UpdateMuditaOS;
+class WorkerDesktop;
 
 namespace service::name
 {
diff --git a/module-services/service-desktop/WorkerDesktop.cpp b/module-services/service-desktop/WorkerDesktop.cpp
index a2ba57d2d073180f72004f9242d1cdfa10ec381a..29e2a63a25a57b9fc35cb62f39fe8b1fd918dda9 100644
--- a/module-services/service-desktop/WorkerDesktop.cpp
+++ b/module-services/service-desktop/WorkerDesktop.cpp
@@ -2,7 +2,16 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "WorkerDesktop.hpp"
-#include "MessageHandler.hpp"
+
+#include <map>    // for map
+#include <vector> // for vector
+
+#include "MessageHandler.hpp"      // for MessageHandler, MessageHandler::sendQueue
+#include "ParserFSM.hpp"           // for StateMachine
+#include "bsp/usb_cdc/usb_cdc.hpp" // for usbCDCInit, usbCDCSend
+#include "log/log.hpp"             // for LOG_ERROR, LOG_INFO
+#include "projdefs.h"              // for pdTRUE
+#include "queue.h"                 // for xQueueReceive, QueueDefinition, QueueHandle_t
 
 bool WorkerDesktop::handleMessage(uint32_t queueID)
 {
diff --git a/module-services/service-desktop/WorkerDesktop.hpp b/module-services/service-desktop/WorkerDesktop.hpp
index f20a8c1412edd50a84bf24e6a2dd29663dd7b7ff..5d49c21f6519cd9c16d2f3f6ca23d9d5a7215ef9 100644
--- a/module-services/service-desktop/WorkerDesktop.hpp
+++ b/module-services/service-desktop/WorkerDesktop.hpp
@@ -4,6 +4,9 @@
 #pragma once
 
 #include <string.h>
+#include <stdint.h> // for uint32_t
+#include <list>     // for list
+#include <string>   // for allocator, string
 
 extern "C"
 {
@@ -13,11 +16,15 @@ extern "C"
 
 #include "Service/Message.hpp"
 #include "Service/Service.hpp"
-#include "Service/Worker.hpp"
-#include "parser/ParserFSM.hpp"
-
+#include "Service/Worker.hpp"   // for Worker, WorkerQueueInfo (ptr only)
+#include "parser/ParserFSM.hpp" // for StateMachine
 #include "bsp/usb_cdc/usb_cdc.hpp"
 
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 class WorkerDesktop : public sys::Worker
 {
   private:
diff --git a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
index d993299b5a28a085459e5e0f8457347d7fd4620b..9441c9dd9a9fc2b02103679a305a64c4a4fb49ae 100644
--- a/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp
@@ -2,10 +2,18 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BackupEndpoint.hpp"
-#include "DesktopMessages.hpp"
-#include "ParserUtils.hpp"
-#include "ServiceDesktop.hpp"
-#include <Service/Bus.hpp>
+
+#include <Service/Bus.hpp> // for Bus
+#include <filesystem>      // for path
+#include <memory>          // for make_shared
+
+#include "DesktopMessages.hpp" // for BackupMessage
+#include "ParserUtils.hpp" // for Method, backupReady, backupRequest, backupUpload, Code, Code::BadRequest, Method::del, Method::get, Method::post, Method::put
+#include "ServiceDesktop.hpp" // for service_desktop
+#include "Context.hpp"        // for Context
+#include "MessageHandler.hpp" // for MessageHandler
+#include "json/json11.hpp"    // for Json, Json::object
+#include "vfs.hpp"            // for vfs, os_backup
 
 static bool backupReady = false;
 
diff --git a/module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp b/module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp
index d5d521e5766942ca2974f143ca53a019e5af59e2..6cc6fd7c834c28b08487d4c643400e9836985b63 100644
--- a/module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/backup/BackupEndpoint.hpp
@@ -1,9 +1,21 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Endpoint.hpp"
-#include "ParserUtils.hpp"
+#include <string> // for string
+
+#include "Endpoint.hpp"    // for Endpoint
+#include "ParserUtils.hpp" // for parserFSM
 #include "ServiceDesktop.hpp"
+#include "Service/Common.hpp" // for ReturnCodes
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/backup/BackupRestore.cpp b/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
index 30815dcd2cf485bde990e1868f256858c4f9dc99..d9d030f00e7511a0d7ffc9ea6474045ab90436c1 100644
--- a/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
+++ b/module-services/service-desktop/endpoints/backup/BackupRestore.cpp
@@ -2,11 +2,25 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BackupRestore.hpp"
-#include "vfs.hpp"
-#include "microtar/src/microtar.hpp"
-#include "api/DBServiceAPI.hpp"
-#include "service-db/includes/DBServiceName.hpp"
-#include "SystemManager/SystemManager.hpp"
+
+#include <assert.h>   // for assert
+#include <stdint.h>   // for uint32_t
+#include <filesystem> // for path
+#include <memory>     // for allocator, unique_ptr
+#include <string>     // for string, operator+, basic_string, char_traits
+#include <vector>     // for vector
+
+#include "vfs.hpp" // for vfs, vfs::DirectoryEntry, os_backup, tar_buf, PATH_BACKUP, vfs::FILE, user_disk
+#include "microtar/src/microtar.hpp" // for mtar_close, mtar_header_t, MTAR_ESUCCESS, mtar_strerror, mtar_open, mtar_finalize, mtar_next, mtar_read_data, mtar_read_header, mtar_write_data, mtar_write_file_header, mtar_t, MTAR_TREG
+#include "api/DBServiceAPI.hpp"      // for DBServiceAPI
+#include "service-db/includes/DBServiceName.hpp" // for db
+#include "SystemManager/SystemManager.hpp"       // for SystemManager
+#include "log/log.hpp"                           // for LOG_INFO, LOG_ERROR
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 static const long unsigned int empty_dirlist_size = 2;
 static const auto backup_file_name                = "backup.tar";
diff --git a/module-services/service-desktop/endpoints/backup/BackupRestore.hpp b/module-services/service-desktop/endpoints/backup/BackupRestore.hpp
index ed127be95d3c35f5d0c2bbaa47e5a82baee62252..f980f89061d72b14cc790f53811621a356f198c4 100644
--- a/module-services/service-desktop/endpoints/backup/BackupRestore.hpp
+++ b/module-services/service-desktop/endpoints/backup/BackupRestore.hpp
@@ -5,6 +5,11 @@
 
 #include "Service/Service.hpp"
 
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 class BackupRestore
 {
   public:
diff --git a/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp b/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp
index 4e2b21d07044c8a8d75e6f9539a4ba3595a7ffc1..723123f280d436f6853506a7f294e0b0c00c4ea2 100644
--- a/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.cpp
@@ -3,6 +3,8 @@
 
 #include "CalllogEndpoint.hpp"
 
+#include "Context.hpp" // for Context
+
 using namespace parserFSM;
 
 auto CalllogEndpoint::handle(Context &context) -> void
diff --git a/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp b/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp
index 93e12eff1ffceca3cf55412f3ba171f568197316..347728eeabc4a3f3a29e54a3adcf9afa96281e73 100644
--- a/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/calllog/CalllogEndpoint.hpp
@@ -3,9 +3,22 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <memory> // for make_unique, unique_ptr
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
-#include "CalllogHelper.hpp"
+#include "CalllogHelper.hpp" // for CalllogHelper
+#include "ParserUtils.hpp"   // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp b/module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp
index c54f0f5c5107386db51b39c9b8e45a34aa99f720..f05fde7b778c0a02065913225f16b855be1e7ee9 100644
--- a/module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp
+++ b/module-services/service-desktop/endpoints/calllog/CalllogHelper.cpp
@@ -1,13 +1,24 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <module-db/queries/calllog/QueryCalllogGet.hpp>
-#include <module-db/queries/calllog/QueryCalllogGetCount.hpp>
-#include <module-db/queries/calllog/QueryCalllogRemove.hpp>
-#include <module-db/queries/calllog/QueryCalllogGetByContactID.hpp>
+#include <module-db/queries/calllog/QueryCalllogGet.hpp>            // for CalllogGet, CalllogGetResult
+#include <module-db/queries/calllog/QueryCalllogGetCount.hpp>       // for CalllogGetCount, CalllogGetCountResult
+#include <module-db/queries/calllog/QueryCalllogRemove.hpp>         // for CalllogRemove, CalllogRemoveResult
+#include <module-db/queries/calllog/QueryCalllogGetByContactID.hpp> // for CalllogGetByContactID, CalllogGetByContactIDResult
+#include <memory>                                                   // for make_unique, unique_ptr
+#include <ostream>                                                  // for stringstream, basic_ostream, basic_ios::clear
+#include <utility>                                                  // for move
+#include <vector>                                                   // for vector
 
-#include "CalllogEndpoint.hpp"
 #include "CalllogHelper.hpp"
+#include "BaseInterface.hpp"    // for Interface, Interface::Name, Interface::Name::Calllog
+#include "Common/Query.hpp"     // for EndpointListener, Query, QueryListener, QueryResult
+#include "Context.hpp"          // for Context
+#include "MessageHandler.hpp"   // for MessageHandler
+#include "ParserUtils.hpp"      // for Code, Code::InternalServerError, Code::OK, parserFSM
+#include "PhoneNumber.hpp"      // for PhoneNumber::View
+#include "api/DBServiceAPI.hpp" // for DBServiceAPI
+#include "utf8/UTF8.hpp"        // for UTF8
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp b/module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp
index e8f4d10b86a18f08c6e5d964d95edf6fbd5cc338..c4c5fdcbfabcb26d70faec258a5bcc98477ec3da 100644
--- a/module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp
+++ b/module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp
@@ -3,17 +3,26 @@
 
 #pragma once
 
+#include <application-phonebook/models/PhonebookModel.hpp>
+#include <service-db/api/DBServiceAPI.hpp>
+#include <string> // for string, allocator
+
 #include "Common/Query.hpp"
 #include "Context.hpp"
 #include "Service/Service.hpp"
-#include "Service/Common.hpp"
-#include "DBHelper.hpp"
-#include <application-phonebook/models/PhonebookModel.hpp>
-#include <service-db/api/DBServiceAPI.hpp>
-#include "CalllogRecord.hpp"
+#include "Service/Common.hpp" // for ReturnCodes
+#include "DBHelper.hpp"       // for DBHelper
+#include "CalllogRecord.hpp"  // for CalllogRecord
+#include "json/json11.hpp"    // for Json
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace parserFSM
 {
+    class Context;
 
     class CalllogHelper : public DBHelper
     {
diff --git a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
index a89d4d7b65d8ac1e8ddb65ad45c2120af5c05dbd..46a1aff5039f8e58ca36fd6fde78ea8e81ed4334 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactHelper.cpp
@@ -1,19 +1,30 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "ContactRecord.hpp"
+#include <queries/phonebook/QueryContactGet.hpp>    // for ContactGet, ContactGetSize, ContactGetResult
+#include <queries/phonebook/QueryContactAdd.hpp>    // for ContactAdd, ContactAddResult
+#include <queries/phonebook/QueryContactRemove.hpp> // for ContactRemove, ContactRemoveResult
+#include <memory>                                   // for make_unique, unique_ptr
+#include <utility>                                  // for move
+#include <vector>                                   // for vector
+
+#include "ContactRecord.hpp" // for ContactRecord, ContactRecord::Number
 #include "ContactHelper.hpp"
-#include "Common/Query.hpp"
-#include "ParserUtils.hpp"
-#include "Service/Common.hpp"
-#include "api/DBServiceAPI.hpp"
-#include "log/log.hpp"
-#include "queries/phonebook/QueryContactGetByID.hpp"
-#include "queries/phonebook/QueryContactUpdate.hpp"
-#include "json/json11.hpp"
-#include <queries/phonebook/QueryContactGet.hpp>
-#include <queries/phonebook/QueryContactAdd.hpp>
-#include <queries/phonebook/QueryContactRemove.hpp>
+#include "Common/Query.hpp"                          // for EndpointListener, Query, QueryListener, QueryResult
+#include "ParserUtils.hpp"                           // for Code, Code::InternalServerError, Code::OK, parserFSM
+#include "Service/Common.hpp"                        // for ReturnCodes, ReturnCodes::Success, ReturnCodes::Failure
+#include "api/DBServiceAPI.hpp"                      // for DBServiceAPI
+#include "log/log.hpp"                               // for LOG_ERROR
+#include "queries/phonebook/QueryContactGetByID.hpp" // for ContactGetByID, ContactGetByIDResult
+#include "queries/phonebook/QueryContactUpdate.hpp"  // for ContactUpdate, ContactUpdateResult
+#include "json/json11.hpp"                           // for Json, Json::array, Json::object
+#include "BaseInterface.hpp"                         // for Interface, Interface::Name, Interface::Name::Contact
+#include "Common/Common.hpp"                         // for ContactNumberType, ContactNumberType::CELL
+#include "Context.hpp"                               // for Context
+#include "MessageHandler.hpp"                        // for MessageHandler
+#include "PhoneNumber.hpp"                           // for PhoneNumber, PhoneNumber::View
+#include "queries/RecordQuery.hpp"                   // for RecordsSizeQueryResult
+#include "utf8/UTF8.hpp"                             // for UTF8
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/contacts/ContactHelper.hpp b/module-services/service-desktop/endpoints/contacts/ContactHelper.hpp
index 552fc897adc09a372cd55e7b1ef1f857b8703ea5..890543acff428c3acacf4d262ce7284a14c754e6 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactHelper.hpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactHelper.hpp
@@ -3,17 +3,26 @@
 
 #pragma once
 
+#include <application-phonebook/models/PhonebookModel.hpp>
+#include <service-db/api/DBServiceAPI.hpp>
+#include <string> // for string, allocator
+
 #include "Common/Query.hpp"
 #include "Context.hpp"
 #include "Service/Service.hpp"
-#include "Service/Common.hpp"
-#include "DBHelper.hpp"
-#include <application-phonebook/models/PhonebookModel.hpp>
-#include <service-db/api/DBServiceAPI.hpp>
-#include "ContactRecord.hpp"
+#include "Service/Common.hpp" // for ReturnCodes
+#include "DBHelper.hpp"       // for DBHelper
+#include "ContactRecord.hpp"  // for ContactRecord
+#include "json/json11.hpp"    // for Json
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace parserFSM
 {
+    class Context;
 
     class ContactHelper : public DBHelper
     {
diff --git a/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp b/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp
index ce727c076a1a62435f17b6a24bff5ee952cde7aa..da56a0a2048e8d01bc050ef07d60364c7a889106 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.cpp
@@ -2,9 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ContactsEndpoint.hpp"
-#include "queries/phonebook/QueryContactGet.hpp"
-#include <memory>
-#include <string>
+
+#include <memory> // for unique_ptr
+
+#include "Context.hpp"                // for Context
+#include "contacts/ContactHelper.hpp" // for ContactHelper
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp b/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp
index 242a39a147cf994910b88f882d4ed5416b1ac5f0..720fee58b99681da564fca99c68bedeab09d14dc 100644
--- a/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/contacts/ContactsEndpoint.hpp
@@ -3,9 +3,22 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <memory> // for make_unique, unique_ptr
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
-#include "ContactHelper.hpp"
+#include "ContactHelper.hpp" // for ContactHelper
+#include "ParserUtils.hpp"   // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
index 7ffc6228a589a82c97ded15a2cbfa87041af29b6..b8d0a23b9e2a416b53f328e2c5741bab3db402e2 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.cpp
@@ -3,6 +3,8 @@
 
 #include "DeveloperModeEndpoint.hpp"
 
+#include "Context.hpp" // for Context
+
 using namespace parserFSM;
 
 auto DeveloperModeEndpoint::handle(Context &context) -> void
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp
index b614a97ea2e7a16aebc5e8117a657b270543a25b..96939daceff73ac2be756dc7029126ceab11695a 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeEndpoint.hpp
@@ -3,9 +3,22 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <memory> // for make_unique, unique_ptr
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
-#include "DeveloperModeHelper.hpp"
+#include "DeveloperModeHelper.hpp" // for DeveloperModeHelper
+#include "ParserUtils.hpp"         // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
index bdd5ea4de54e0a310c53d0dc62ca627c1154c1bd..92bb3d5003db083a178c392f31470f7827547add 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.cpp
@@ -1,8 +1,13 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "DeveloperModeEndpoint.hpp"
 #include "DeveloperModeHelper.hpp"
+#include "ParserUtils.hpp" // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
 
 using namespace parserFSM;
 auto DeveloperModeHelper::processGetRequest(Context &context) -> sys::ReturnCodes
diff --git a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp
index 7129ace7f1c91348a4a00bfb95faef82be3a9c3d..7152e6a37825cfc0b4eae6fcbbb65793633416c1 100644
--- a/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp
+++ b/module-services/service-desktop/endpoints/developerMode/DeveloperModeHelper.hpp
@@ -3,13 +3,21 @@
 
 #pragma once
 
+#include <string> // for allocator, string
+
 #include "Common/Query.hpp"
 #include "Context.hpp"
 #include "Service/Service.hpp"
-#include "Service/Common.hpp"
+#include "Service/Common.hpp" // for ReturnCodes
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace parserFSM
 {
+    class Context;
 
     class DeveloperModeHelper
     {
diff --git a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
index 8944ad7d197727bf5e658d13d2568af5503c6e19..25adc432ae7879b4c0cd45945e8894264629abe1 100644
--- a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp
@@ -2,12 +2,17 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "DeviceInfoEndpoint.hpp"
-#include <source/version.hpp>
-#include <vfs.hpp>
-#include <common_data/EventStore.hpp>
-#include <time/time_conversion.hpp>
-#include <service-desktop/ServiceDesktop.hpp>
-#include <string>
+
+#include <source/version.hpp>         // for GIT_BRANCH, GIT_REV, GIT_TAG
+#include <vfs.hpp>                    // for vfs::FilesystemStats, vfs
+#include <common_data/EventStore.hpp> // for GSM, Battery, SignalStrength
+#include <time/time_conversion.hpp>   // for Time
+#include <stdint.h>                   // for uint32_t
+#include <string>                     // for to_string, allocator, string
+
+#include "Context.hpp"        // for Context
+#include "MessageHandler.hpp" // for MessageHandler
+#include "json/json11.hpp"    // for Json, Json::object
 
 auto DeviceInfoEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp
index 6f203c623936cbfec01308aed929e08ebc561f7f..03c56ade557f947465d25c33fe245e9f22a26b5c 100644
--- a/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.hpp
@@ -3,8 +3,20 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
+#include "ParserUtils.hpp" // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
index 6296f55cb4ffaaa14971658cd6f77808853bdc72..e5348dea09ca222a36da85d0fc240d7467cf7e9e 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.cpp
@@ -2,9 +2,21 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FactoryReset.hpp"
-#include "vfs.hpp"
-#include "service-db/includes/DBServiceName.hpp"
-#include "SystemManager/SystemManager.hpp"
+
+#include <stdint.h>   // for uint32_t
+#include <filesystem> // for path
+#include <memory>     // for unique_ptr, allocator
+#include <vector>     // for vector
+
+#include "vfs.hpp" // for vfs, vfs::DirectoryEntry, copy_buf, os_factory, vfs::FILE, eMMC_disk, vfs::FileAttributes, vfs::FileAttributes::Directory, PATH_FACTORY
+#include "service-db/includes/DBServiceName.hpp" // for db
+#include "SystemManager/SystemManager.hpp"       // for SystemManager
+#include "log/log.hpp"                           // for LOG_ERROR, LOG_INFO
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace FactoryReset
 {
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp
index 32b93d420e8e6375b16752a0b2064eb931743e85..13a8412771de746470c6cff1905479cb2b7d7da2 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp
@@ -3,8 +3,15 @@
 
 #pragma once
 
+#include <string> // for string
+
 #include "Service/Service.hpp"
 
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 namespace FactoryReset
 {
     bool Run(sys::Service *ownerService);
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
index 6bfb769276d14d689506704d2b14b18462da6862..37289ad472dc604ea97dfa37845cb3643956e326 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp
@@ -2,9 +2,15 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FactoryResetEndpoint.hpp"
-#include "DesktopMessages.hpp"
-#include "ServiceDesktop.hpp"
-#include <Service/Bus.hpp>
+
+#include <Service/Bus.hpp> // for Bus
+#include <memory>          // for make_shared
+
+#include "DesktopMessages.hpp" // for FactoryMessage
+#include "ServiceDesktop.hpp"  // for service_desktop
+#include "Context.hpp"         // for Context
+#include "MessageHandler.hpp"  // for MessageHandler
+#include "json/json11.hpp"     // for Json, Json::object
 
 auto FactoryResetEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp
index 02489bc48da4aac775014ed498e31d457338e657..ae99d87a8455c053344ed0b2a5d0faf1358d515f 100644
--- a/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.hpp
@@ -3,8 +3,20 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
+#include "ParserUtils.hpp" // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
index 7abbfff1b4f33bd8f3a4744ca06db4927bc221e8..a3416e899acde3219285ad9e42a4a69b184bc0bc 100644
--- a/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
+++ b/module-services/service-desktop/endpoints/messages/MessageHelper.cpp
@@ -2,33 +2,39 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MessageHelper.hpp"
-#include "Common/Query.hpp"
-#include "ParserUtils.hpp"
-#include "PhoneNumber.hpp"
-#include "SMSRecord.hpp"
-#include "SMSTemplateRecord.hpp"
-#include "Service/Common.hpp"
-#include "ThreadRecord.hpp"
-#include "api/DBServiceAPI.hpp"
-#include "queries/messages/sms/QuerySMSGet.hpp"
-#include "queries/messages/sms/QuerySMSGetByContactID.hpp"
-#include "queries/messages/sms/QuerySMSGetByThreadID.hpp"
-#include "queries/messages/sms/QuerySMSGetByID.hpp"
-#include "queries/messages/sms/QuerySMSGetByText.hpp"
-#include "queries/messages/sms/QuerySMSGetCount.hpp"
-#include "queries/messages/threads/QueryThreadsSearchForList.hpp"
-#include "queries/messages/sms/QuerySMSRemove.hpp"
-#include "queries/messages/templates/QuerySMSTemplateGet.hpp"
-#include "queries/messages/templates/QuerySMSTemplateRemove.hpp"
-#include "queries/messages/templates/QuerySMSTemplateUpdate.hpp"
-#include "queries/messages/templates/QuerySMSTemplateAdd.hpp"
-#include "queries/messages/templates/QuerySMSTemplateGetByID.hpp"
-#include "queries/messages/templates/QuerySMSTemplateGetCount.hpp"
-#include "queries/messages/threads/QueryThreadMarkAsRead.hpp"
-#include "utf8/UTF8.hpp"
-#include "json/json11.hpp"
-#include <memory>
-#include <string>
+
+#include <memory>  // for make_unique, unique_ptr
+#include <string>  // for string
+#include <utility> // for move
+#include <vector>  // for vector
+
+#include "Common/Query.hpp" // for EndpointListener, Query, QueryListener, QueryResult
+#include "ParserUtils.hpp" // for Code, id, count, Code::InternalServerError, Code::OK, contactID, msgTemplate, threadID, messageBody, templateText, date, isUnread, offset, type, dateSent, msgCount, parserFSM, phoneNumber, snippet, unreadMsgCount
+#include "PhoneNumber.hpp" // for PhoneNumber::View
+#include "SMSRecord.hpp"   // for SMSRecord
+#include "SMSTemplateRecord.hpp"                                   // for SMSTemplateRecord
+#include "Service/Common.hpp"                                      // for ReturnCodes, ReturnCodes::Success
+#include "ThreadRecord.hpp"                                        // for ThreadRecord
+#include "api/DBServiceAPI.hpp"                                    // for DBServiceAPI
+#include "queries/messages/sms/QuerySMSGet.hpp"                    // for SMSGet, SMSGetResult
+#include "queries/messages/sms/QuerySMSGetByContactID.hpp"         // for SMSGetByContactID, SMSGetByContactIDResult
+#include "queries/messages/sms/QuerySMSGetByThreadID.hpp"          // for SMSGetByThreadID, SMSGetByThreadIDResult
+#include "queries/messages/sms/QuerySMSGetByID.hpp"                // for SMSGetByID, SMSGetByIDResult
+#include "queries/messages/sms/QuerySMSGetByText.hpp"              // for SMSGetByText, SMSGetByTextResult
+#include "queries/messages/sms/QuerySMSGetCount.hpp"               // for SMSGetCount, SMSGetCountResult
+#include "queries/messages/sms/QuerySMSRemove.hpp"                 // for SMSRemove, SMSRemoveResult
+#include "queries/messages/templates/QuerySMSTemplateGet.hpp"      // for SMSTemplateGet, SMSTemplateGetResult
+#include "queries/messages/templates/QuerySMSTemplateRemove.hpp"   // for SMSTemplateRemove, SMSTemplateRemoveResult
+#include "queries/messages/templates/QuerySMSTemplateUpdate.hpp"   // for SMSTemplateUpdate, SMSTemplateUpdateResult
+#include "queries/messages/templates/QuerySMSTemplateAdd.hpp"      // for SMSTemplateAdd, SMSTemplateAddResult
+#include "queries/messages/templates/QuerySMSTemplateGetByID.hpp"  // for SMSTemplateGetByID, SMSTemplateGetByIDResult
+#include "queries/messages/templates/QuerySMSTemplateGetCount.hpp" // for SMSTemplateGetCount, SMSTemplateGetCountResult
+#include "queries/messages/threads/QueryThreadMarkAsRead.hpp" // for MarkAsRead, MarkAsRead::Read, MarkAsReadResult, MarkAsRead::Read::False, MarkAsRead::Read::True, query
+#include "utf8/UTF8.hpp"   // for UTF8
+#include "json/json11.hpp" // for Json, Json::array, Json::object
+#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::SMS, Interface::Name::SMSTemplate, Interface::Name::SMSThread
+#include "Context.hpp"        // for Context
+#include "MessageHandler.hpp" // for MessageHandler
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/messages/MessageHelper.hpp b/module-services/service-desktop/endpoints/messages/MessageHelper.hpp
index c98e4be7a6651b5c6463069b587c00e7ef87bd17..fb62b3b60505374fff1a34747ff450ba6d52c019 100644
--- a/module-services/service-desktop/endpoints/messages/MessageHelper.hpp
+++ b/module-services/service-desktop/endpoints/messages/MessageHelper.hpp
@@ -3,17 +3,28 @@
 
 #pragma once
 
+#include <service-db/api/DBServiceAPI.hpp>
+#include <memory>
+#include <string> // for string, allocator
+
 #include "Common/Query.hpp"
-#include "SMSTemplateRecord.hpp"
+#include "SMSTemplateRecord.hpp" // for SMSTemplateRecord
 #include "Service/Service.hpp"
-#include "Service/Common.hpp"
-#include "DBHelper.hpp"
-#include <memory>
-#include <service-db/api/DBServiceAPI.hpp>
+#include "Service/Common.hpp" // for ReturnCodes
+#include "DBHelper.hpp"       // for DBHelper
 #include "Endpoint.hpp"
+#include "SMSRecord.hpp"    // for SMSRecord
+#include "ThreadRecord.hpp" // for ThreadRecord
+#include "json/json11.hpp"  // for Json
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace parserFSM
 {
+    class Context;
 
     class MessageHelper final : public DBHelper
     {
diff --git a/module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp b/module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp
index 4c7fed9c1d9ab1250c945b8dda77e7c2af497cc6..3a667dae93662f76192e6c40cfbab1c2b150d417 100644
--- a/module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/messages/MessagesEndpoint.cpp
@@ -2,7 +2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MessagesEndpoint.hpp"
-#include "module-db/queries/messages/templates/QuerySMSTemplateGetByID.hpp"
+
+#include "Context.hpp" // for Context
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp b/module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp
index 32537bfe5f2621c4d5a5edd38a9d65c10b4e47db..8e4864e1a4549e0443c71becd6645fcd0a518679 100644
--- a/module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/messages/MessagesEndpoint.hpp
@@ -3,9 +3,22 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <memory> // for make_shared, shared_ptr
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
-#include "MessageHelper.hpp"
+#include "MessageHelper.hpp" // for MessageHelper
+#include "ParserUtils.hpp"   // for parserFSM
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
index 96b191bb31bd26f4cb9908c8b38d503cc1ecd104..a35cf213271e74e450bbf4af5847919f5e86e88f 100644
--- a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp
@@ -2,10 +2,16 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "RestoreEndpoint.hpp"
-#include "DesktopMessages.hpp"
-#include "ParserUtils.hpp"
-#include "ServiceDesktop.hpp"
-#include <Service/Bus.hpp>
+
+#include <Service/Bus.hpp> // for Bus
+#include <memory>          // for make_shared
+
+#include "DesktopMessages.hpp" // for RestoreMessage
+#include "ParserUtils.hpp"     // for restoreRequest, Method, Method::post
+#include "ServiceDesktop.hpp"  // for service_desktop
+#include "Context.hpp"         // for Context
+#include "MessageHandler.hpp"  // for MessageHandler
+#include "json/json11.hpp"     // for Json, Json::object
 
 auto RestoreEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp
index 0037f312144d585261f316b295558859c152d19e..00272c304c7cb586c22af4feec7d1b5f702584bc 100644
--- a/module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/restore/RestoreEndpoint.hpp
@@ -1,10 +1,21 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Endpoint.hpp"
-#include "ParserUtils.hpp"
+#include <string> // for string
+
+#include "Endpoint.hpp"    // for Endpoint
+#include "ParserUtils.hpp" // for parserFSM
 #include "ServiceDesktop.hpp"
 
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 using namespace parserFSM;
 
 class RestoreEndpoint : public Endpoint
diff --git a/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp b/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
index 3b5a213ec87eb1cc2d90b45e75114026201e204e..9c225d5058293549e9d7ec8ee89cc882acf296e5 100644
--- a/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
+++ b/module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp
@@ -2,9 +2,18 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "UpdateEndpoint.hpp"
-#include "DesktopMessages.hpp"
-#include "ServiceDesktop.hpp"
-#include <Service/Bus.hpp>
+
+#include <Service/Bus.hpp> // for Bus
+#include <filesystem>      // for operator/, path
+#include <memory>          // for allocator, make_shared
+
+#include "DesktopMessages.hpp" // for UpdateOsMessage
+#include "ServiceDesktop.hpp"  // for service_desktop
+#include "Context.hpp"         // for Context
+#include "MessageHandler.hpp"  // for MessageHandler
+#include "UpdateMuditaOS.hpp"  // for update
+#include "json/json11.hpp"     // for Json, Json::object
+#include "vfs.hpp"             // for vfs, os_updates
 
 auto UpdateEndpoint::handle(Context &context) -> void
 {
diff --git a/module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp b/module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp
index c2a214dcfb9ee9d26b8c6a44ef885a092d3fa5fb..6cf872cc922090250d980f94dfcb2f2d31fc0c5f 100644
--- a/module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp
+++ b/module-services/service-desktop/endpoints/update/UpdateEndpoint.hpp
@@ -3,8 +3,21 @@
 
 #pragma once
 
-#include "Endpoint.hpp"
+#include <string> // for string
+
+#include "Endpoint.hpp" // for Endpoint
 #include "Service/Service.hpp"
+#include "ParserUtils.hpp"    // for parserFSM
+#include "Service/Common.hpp" // for ReturnCodes
+
+namespace parserFSM
+{
+    class Context;
+} // namespace parserFSM
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp
index 44994b9fd48dd3f670e85cd55f26993b84be94e6..6a8ca86d2a915c0bd44c2612f3a0dd72920c5088 100644
--- a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp
+++ b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp
@@ -5,10 +5,22 @@
 #if defined(TARGET_RT1051)
 #include "board/cross/eMMC/eMMC.hpp"
 #endif
-#include <service-desktop/ServiceDesktop.hpp>
-#include <service-gui/ServiceGUI.hpp>
-#include <math.h>
-#include <module-apps/application-desktop/ApplicationDesktop.hpp>
+#include <service-desktop/ServiceDesktop.hpp>                     // for ServiceDesktop
+#include <module-apps/application-desktop/ApplicationDesktop.hpp> // for name_desktop
+#include <stdarg.h>                                               // for va_end, va_list, va_start
+#include <stdio.h>                                                // for vsnprintf, snprintf, sprintf
+#include <stdlib.h>                                               // for strtoull
+#include <array>                                                  // for array
+#include <memory> // for unique_ptr, make_shared, allocator, __shared_ptr_access, shared_ptr
+
+#include "DesktopMessages.hpp"             // for UpdateOsMessage
+#include "Service/Bus.hpp"                 // for Bus
+#include "SystemManager/SystemManager.hpp" // for SystemManager
+#include "crc32/crc32.h"                   // for Crc32_ComputeBuf
+#include "json/json11.hpp"                 // for Json, Json::object
+#include "log/log.hpp"                     // for LOG_INFO, LOG_DEBUG, LOG_ERROR
+#include "microtar/src/microtar.hpp" // for mtar_header_t, mtar_close, mtar_open, mtar_read_data, MTAR_ESUCCESS, mtar_find, mtar_next, mtar_read_header, mtar_t, MTAR_ENOTFOUND, MTAR_ENULLRECORD, MTAR_EOPENFAIL, MTAR_TDIR
+#include "vfs.hpp" // for vfs, tar_buf, os_previous, os_updates, os_current, tmp, vfs::FILE, crc_char_size, vfs::DirectoryEntry, os_version, user_disk, version_string, boot_json, crc32, crc_buf, crc_radix, eMMC_disk
 
 FileInfo::FileInfo(mtar_header_t &h, unsigned long crc32) : fileSize(h.size), fileCRC32(crc32)
 {
diff --git a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp
index 7396a8cfef84b4fbcfe395362122d4a199cf0e5f..d8a8bbfe62b3f63353cab36a7ff2d32b1110b0a2 100644
--- a/module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp
+++ b/module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp
@@ -3,11 +3,17 @@
 
 #pragma once
 
-#include <module-utils/microtar/src/microtar.hpp>
-#include <vfs.hpp>
-#include <json/json11.hpp>
+#include <module-utils/microtar/src/microtar.hpp> // for mtar_header_t, mtar_t
+#include <vfs.hpp>                                // for PATH_SYS, PATH_TMP
+#include <json/json11.hpp>                        // for Json
+#include <stdint.h>                               // for uint32_t
+#include <filesystem>                             // for path, filesystem
+#include <iosfwd>                                 // for size_t
+#include <string>                                 // for string, allocator
+#include <vector>                                 // for vector
 
 class ServiceDesktop;
+
 namespace fs = std::filesystem;
 namespace updateos
 {
diff --git a/module-services/service-desktop/parser/MessageHandler.cpp b/module-services/service-desktop/parser/MessageHandler.cpp
index 48a82a3202dd379d008f3d70511f6e377f9d0a66..94498d4143bf65ac98617b4ee248ce9713d621e1 100644
--- a/module-services/service-desktop/parser/MessageHandler.cpp
+++ b/module-services/service-desktop/parser/MessageHandler.cpp
@@ -2,11 +2,21 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "MessageHandler.hpp"
-#include "Context.hpp"
-#include "EndpointFactory.hpp"
-#include "log/log.hpp"
-#include "ParserUtils.hpp"
-#include <memory>
+
+#include <bits/exception.h> // for exception
+#include <inttypes.h>       // for PRIu32
+#include <memory>           // for operator!=, unique_ptr
+
+#include "Context.hpp"         // for Context
+#include "EndpointFactory.hpp" // for EndpointFactory
+#include "log/log.hpp"         // for LOG_ERROR, LOG_DEBUG
+#include "Endpoint.hpp"        // for Endpoint
+#include "FreeRTOS.h"          // for xQueueHandle
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/parser/MessageHandler.hpp b/module-services/service-desktop/parser/MessageHandler.hpp
index 200c5fc2fab9aee64c4dd338669016bd1e76246e..e0bf70fc65599be3ed9ca669f5781ddab1230101 100644
--- a/module-services/service-desktop/parser/MessageHandler.hpp
+++ b/module-services/service-desktop/parser/MessageHandler.hpp
@@ -2,13 +2,20 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Service/Service.hpp"
-#include <string>
-#include "json/json11.hpp"
 #include <log/log.hpp>
+#include <string> // for string
+
+#include "Service/Service.hpp"
+#include "json/json11.hpp" // for Json
+
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 extern "C"
 {
-#include <FreeRTOS.h>
+#include <FreeRTOS.h> // for xQueueHandle
 #include <queue.h>
 }
 
diff --git a/module-services/service-desktop/parser/ParserFSM.cpp b/module-services/service-desktop/parser/ParserFSM.cpp
index affb921fddf090de55255470a13447e1b26c55df..e756af1bc83bf4c1c990d9f7a9e563d03b7e48ec 100644
--- a/module-services/service-desktop/parser/ParserFSM.cpp
+++ b/module-services/service-desktop/parser/ParserFSM.cpp
@@ -2,11 +2,18 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ParserFSM.hpp"
-#include <service-desktop/ServiceDesktop.hpp>
-#include <log/log.hpp>
-#include <json/json11.hpp>
-#include <memory>
-#include <string>
+
+#include <log/log.hpp> // for LOG_DEBUG, LOG_ERROR
+#include <memory>      // for unique_ptr, make_unique
+#include <string>      // for string
+
+#include "MessageHandler.hpp" // for MessageHandler
+#include "ParserUtils.hpp" // for eraseFront, calcPayloadLength, extractPayload, getHeader, removeHeader, size_header, endpointChar, parserFSM
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 using namespace parserFSM;
 
diff --git a/module-services/service-desktop/parser/ParserFSM.hpp b/module-services/service-desktop/parser/ParserFSM.hpp
index 7659c12cf9a8b33910c5e854e001a41fc27fec0b..f922586e8c24948cc0600316ea9db799c8d1ad90 100644
--- a/module-services/service-desktop/parser/ParserFSM.hpp
+++ b/module-services/service-desktop/parser/ParserFSM.hpp
@@ -2,10 +2,17 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
+#include <string> // for string
+
 #include "ParserUtils.hpp"
 #include "json/json11.hpp"
 #include "MessageHandler.hpp"
 
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 namespace parserFSM
 {
     enum class State
diff --git a/module-services/service-desktop/parser/ParserUtils.cpp b/module-services/service-desktop/parser/ParserUtils.cpp
index 8db1c0d304c430fad75931035c172865945c8e16..5fbf5eb2cfdc2ba3e107dc53c0a9c61759cff3c5 100644
--- a/module-services/service-desktop/parser/ParserUtils.cpp
+++ b/module-services/service-desktop/parser/ParserUtils.cpp
@@ -3,6 +3,8 @@
 
 #include "ParserUtils.hpp"
 
+#include "log/log.hpp" // for LOG_ERROR
+
 using namespace parserFSM;
 
 bool http::isMethodValid(uint8_t method)
diff --git a/module-services/service-desktop/parser/ParserUtils.hpp b/module-services/service-desktop/parser/ParserUtils.hpp
index 504b5e78b37e09b973e2c97b9ebf14009f3b0f95..f2769ac559262fcd41a861b03305d36445299265 100644
--- a/module-services/service-desktop/parser/ParserUtils.hpp
+++ b/module-services/service-desktop/parser/ParserUtils.hpp
@@ -2,10 +2,12 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include <stdint.h>
-#include <string>
+#include <stdint.h>         // for uint8_t
+#include <log/log.hpp>      // for LOG_ERROR
+#include <bits/exception.h> // for exception
+#include <stddef.h>         // for size_t
+#include <string>           // for string, allocator, basic_string, stol
 #include <vector>
-#include <log/log.hpp>
 
 namespace parserFSM
 {
diff --git a/module-services/service-desktop/tests/unittest.cpp b/module-services/service-desktop/tests/unittest.cpp
index 7ae5d2198ba0f54d6c0c88ccdccb8aa26f67983c..eecb72ed2abf4ad4ba1e2f660afadd2dda55d610 100644
--- a/module-services/service-desktop/tests/unittest.cpp
+++ b/module-services/service-desktop/tests/unittest.cpp
@@ -1,21 +1,30 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Common/Common.hpp"
-#include "ContactRecord.hpp"
-#include "ParserUtils.hpp"
-#include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp"
-#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp"
-#include "ParserFSM.hpp"
-#include "contacts/ContactHelper.hpp"
-#include "messages/MessageHelper.hpp"
-#include "queries/messages/sms/QuerySMSSearchByType.hpp"
-#include "EndpointFactory.hpp"
-#include "contacts/ContactsEndpoint.hpp"
-#include "json/json11.hpp"
-#include <memory>
-#include <vfs.hpp>
-#include <catch2/catch.hpp>
+#include <vfs.hpp>          // for vfs, eMMC_disk
+#include <catch2/catch.hpp> // for AssertionHandler, operator""_catch_sr, SourceLineInfo, StringRef, REQUIRE, Section, SECTION, SectionInfo, TEST_CASE
+#include <memory>           // for allocator, unique_ptr, make_unique, operator==, allocator_traits<>::value_type
+#include <filesystem>       // for path
+#include <string>           // for string, operator==, basic_string, operator+, char_traits
+#include <vector>           // for vector
+
+#include "Common/Common.hpp" // for ContactNumberType, ContactNumberType::PAGER, SMSType, SMSType::DRAFT
+#include "ContactRecord.hpp" // for ContactRecord, ContactRecord::Number
+#include "ParserUtils.hpp" // for EndpointType, Method, Method::get, id, EndpointType::contacts, EndpointType::invalid, contactID, date, dateSent, messageBody, templateText, threadID, parserFSM
+#include "module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp" // for UpdateError, UpdateError::NoError, UpdateMuditaOS
+#include "module-services/service-desktop/endpoints/factoryReset/FactoryReset.hpp" // for CopyDirContent, DeleteDirContent
+#include "ParserFSM.hpp" // for State, StateMachine, State::NoMsg, State::ReceivedPayload, State::ReceivedPartialPayload, State::ReceivedPartialHeader
+#include "contacts/ContactHelper.hpp" // for ContactHelper, address, alternativeName, isBlocked, isFavourite, numbers, primaryName
+#include "messages/MessageHelper.hpp"    // for MessageHelper
+#include "EndpointFactory.hpp"           // for EndpointFactory
+#include "contacts/ContactsEndpoint.hpp" // for ContactsEndpoint
+#include "json/json11.hpp"               // for Json
+#include "Context.hpp"                   // for Context, invalidUuid
+#include "Endpoint.hpp"                  // for Endpoint
+#include "PhoneNumber.hpp"               // for PhoneNumber, PhoneNumber::View
+#include "SMSRecord.hpp"                 // for SMSRecord
+#include "SMSTemplateRecord.hpp"         // for SMSTemplateRecord
+#include "utf8/UTF8.hpp"                 // for UTF8, operator<<
 
 class vfs vfs;
 
diff --git a/module-services/service-eink/ServiceEink.cpp b/module-services/service-eink/ServiceEink.cpp
index 1aceeefe7d81a0282f39ae29b945a4c23073d5e0..e177e0f588fcf1a81aca75b6d79cbc9c58650400 100644
--- a/module-services/service-eink/ServiceEink.cpp
+++ b/module-services/service-eink/ServiceEink.cpp
@@ -11,28 +11,22 @@
 // FreeRTOS
 extern "C"
 {
-#include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
-#include "timers.h"
-#include "semphr.h"
 }
+#include <stdio.h>  // for SEEK_SET
+#include <string.h> // for memset, memcpy
+#include <memory>   // for make_shared, allocator
+
 // module-utils
-#include "log/log.hpp"
+#include "log/log.hpp" // for LOG_FATAL, LOG_ERROR, LOG_DEBUG, LOG_INFO
 // module-vfs
-#include "vfs.hpp"
-#include "EinkIncludes.hpp"
-
+#include "vfs.hpp" // for vfs
 // eink messages
-#include "messages/EinkMessage.hpp"
-#include "messages/ImageMessage.hpp"
-#include "service-gui/messages/GUIMessage.hpp"
-
-#include "SystemManager/SystemManager.hpp"
-
-#include "MessageType.hpp"
-
+#include "messages/EinkMessage.hpp"            // for EinkMessage
+#include "messages/ImageMessage.hpp"           // for ImageMessage
+#include "service-gui/messages/GUIMessage.hpp" // for GUIMessage
+#include "MessageType.hpp" // for MessageType, MessageType::GUIDisplayReady, MessageType::EinkDMATransfer, MessageType::EinkImageData, MessageType::EinkStateRequest, MessageType::EinkTemperatureUpdate
 #include "ServiceEink.hpp"
+#include "Service/Bus.hpp" // for Bus
 
 enum class EinkWorkerCommands
 {
diff --git a/module-services/service-eink/ServiceEink.hpp b/module-services/service-eink/ServiceEink.hpp
index 25a95125667301e9cad6ab8d6f91f60f4e0a0f0d..cb67bcdd32d58dfcd50a789f5d01a634b46a43cb 100644
--- a/module-services/service-eink/ServiceEink.hpp
+++ b/module-services/service-eink/ServiceEink.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 /*
@@ -13,11 +13,15 @@
 
 //#include "board.h"
 
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
+#include <stdint.h> // for uint32_t, int32_t, int8_t, uint8_t
+#include <string>   // for string, allocator
+
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
 // eink bsp
-#include "EinkIncludes.hpp"
-#include "Service/Timer.hpp"
+#include "EinkIncludes.hpp"   // for EinkWaveFormSettings_t, EinkWaveforms_e
+#include "Service/Timer.hpp"  // for Timer, ms
+#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
 
 class ServiceEink : public sys::Service
 {
diff --git a/module-services/service-eink/board/linux/renderer/src/RArea.cpp b/module-services/service-eink/board/linux/renderer/src/RArea.cpp
index 7596f62f356c1bfd0af40da35ab1ebf6b9207780..5b73a7643d115d3fd12474d0ed3ef9a7460cefa8 100644
--- a/module-services/service-eink/board/linux/renderer/src/RArea.cpp
+++ b/module-services/service-eink/board/linux/renderer/src/RArea.cpp
@@ -1,16 +1,15 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-/*
- * RArea.cpp
- *
- *  Created on: 24 kwi 2019
- *      Author: robert
- */
-#include <gtkmm.h>
-#include <cairomm/context.h>
-#include <gdkmm/pixbuf.h>
+#include <cairomm/context.h> // for Context
+#include <gdkmm/pixbuf.h>    // for Pixbuf, COLORSPACE_RGB
+#include <glib.h>            // for guchar
+
 #include "RArea.hpp"
+#include "cairomm/refptr.h" // for RefPtr
+#include "gdkmm/general.h"  // for set_source_pixbuf
+#include "glibmm/refptr.h"  // for RefPtr
+#include "gtkmm/widget.h"   // for Allocation
 
 RArea::RArea() : data{nullptr}
 {}
diff --git a/module-services/service-eink/board/linux/renderer/src/RArea.hpp b/module-services/service-eink/board/linux/renderer/src/RArea.hpp
index 215c00e9629affe35f505a6374e490477fdaf65c..750c12ff58fd8c2860e8fd1d7fa7bacdb7ac6769 100644
--- a/module-services/service-eink/board/linux/renderer/src/RArea.hpp
+++ b/module-services/service-eink/board/linux/renderer/src/RArea.hpp
@@ -13,7 +13,13 @@
 
 #include <cairomm/context.h>
 #include <gtkmm.h>
-#include <gtkmm/drawingarea.h>
+#include <gtkmm/drawingarea.h> // for DrawingArea
+
+namespace Cairo
+{
+    class Context;
+    template <class T_CppObject> class RefPtr;
+} // namespace Cairo
 
 class RArea : public Gtk::DrawingArea
 {
diff --git a/module-services/service-eink/board/linux/renderer/src/RWindow.cpp b/module-services/service-eink/board/linux/renderer/src/RWindow.cpp
index 5b8f76246fe341ff4f106b3a8cacb00348a1c29d..4a3d351f3dfa3428e721a07ca1bc43a28f128a29 100644
--- a/module-services/service-eink/board/linux/renderer/src/RWindow.cpp
+++ b/module-services/service-eink/board/linux/renderer/src/RWindow.cpp
@@ -1,19 +1,25 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include <glib.h>   // for g_timeout_add, gboolean, gpointer
+#include <stddef.h> // for size_t
+#include <unistd.h> // for write, ssize_t
 /*
  * RWindow.cpp
  *
  *  Created on: 24 kwi 2019
  *      Author: robert
  */
-#include <map>
-#include <gtk/gtk.h>
+#include <map>     // for map, operator!=, _Rb_tree_iterator<>::_Self, map<>::iterator, operator==, _Rb_tree_iterator
+#include <utility> // for pair
 
 #include "RWindow.hpp"
+#include "module-bsp/bsp/keyboard/key_codes.hpp" // for KeyCodes, KeyCodes::FnLeft, KeyCodes::FnRight, KeyCodes::JoystickDown, KeyCodes::JoystickEnter, KeyCodes::JoystickLeft, KeyCodes::JoystickRight, KeyCodes::JoystickUp, KeyCodes::NumericKey0, KeyCodes::NumericKey1, KeyCodes::NumericKey2, KeyCodes::NumericKey3, KeyCodes::NumericKey4, KeyCodes::NumericKey5, KeyCodes::NumericKey6, KeyCodes::NumericKey7, KeyCodes::NumericKey8, KeyCodes::NumericKey9, KeyCodes::NumericKeyAst, KeyCodes::NumericKeyPnd, KeyCodes::SSwitchDown, KeyCodes::SSwitchMid, KeyCodes::SSwitchUp, KeyCodes::Torch, KeyCodes::VolDown, KeyCodes::VolUp
+#include "module-bsp/bsp/common.hpp"             // for KeyEvents, KeyEvents::Pressed, KeyEvents::Released
+#include "glibmm/signalproxy.h"                  // for SignalProxy
+#include "module-services/service-eink/board/linux/renderer/src/RArea.hpp" // for RArea
+#include "sigc++/functors/mem_fun.h"                                       // for bound_mem_functor1, mem_fun
 
-#include "module-bsp/bsp/keyboard/key_codes.hpp"
-#include "module-bsp/bsp/common.hpp"
 static gboolean viewUpdate(gpointer data)
 {
     RWindow *win = reinterpret_cast<RWindow *>(data);
diff --git a/module-services/service-eink/board/linux/renderer/src/RWindow.hpp b/module-services/service-eink/board/linux/renderer/src/RWindow.hpp
index 969871f32faf983e7b69789ff73315af0eb4e6c6..5a2039e4298673e638ffd4aee863646ccfc5fa07 100644
--- a/module-services/service-eink/board/linux/renderer/src/RWindow.hpp
+++ b/module-services/service-eink/board/linux/renderer/src/RWindow.hpp
@@ -11,14 +11,16 @@
 #ifndef RENDERER_RWINDOW_HPP_
 #define RENDERER_RWINDOW_HPP_
 
-#include <map>
-#include <cstdint>
 #include <gtkmm.h>
 #include <gtkmm/drawingarea.h>
+#include <gdk/gdk.h> // for GdkEventKey
+#include <map>       // for map
+#include <cstdint>   // for uint32_t, int8_t
 
-#include "RArea.hpp"
-
+#include "RArea.hpp" // for RArea
 #include "module-bsp/bsp/keyboard/key_codes.hpp"
+#include "gtkmm/window.h" // for Window
+
 class RWindow : public Gtk::Window
 {
   protected:
diff --git a/module-services/service-eink/board/linux/renderer/src/gui_renderer.cpp b/module-services/service-eink/board/linux/renderer/src/gui_renderer.cpp
index 44a7ac4a1737ca94e6e4fc851928a727386259f8..6b96ce1ddb95bb0be5732e71144b9d2086396630 100644
--- a/module-services/service-eink/board/linux/renderer/src/gui_renderer.cpp
+++ b/module-services/service-eink/board/linux/renderer/src/gui_renderer.cpp
@@ -9,20 +9,20 @@
 // Description : Hello World in C++, Ansi-style
 //============================================================================
 
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <cstring>
-#include <sys/types.h>
-
-#include <gtkmm.h>
-#include <gtkmm/application.h>
-
-#include "RWindow.hpp"
+#include <sys/mman.h>          // for mmap, shm_open, MAP_FAILED, MAP_SHARED, PROT_READ, PROT_WRITE
+#include <sys/stat.h>          // for mkfifo
+#include <fcntl.h>             // for open, O_WRONLY, O_NONBLOCK, O_CREAT, O_RDWR
+#include <unistd.h>            // for ftruncate
+#include <gtkmm/application.h> // for Application
+#include <errno.h>             // for errno
+#include <stdint.h>            // for uint32_t, uint8_t
+#include <iostream>            // for operator<<, basic_ostream, endl, char_traits, ostream, cerr, cout, std
+#include <cstring>             // for strerror, NULL
+#include <string>              // for string, allocator
+
+#include "RWindow.hpp"     // for RWindow
+#include "glibmm/refptr.h" // for RefPtr
+
 using namespace std;
 
 static const int FrameBufferWidth  = 480;
diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp
index c6effb7df3132b37a7491383c11e5ddd39432f1f..c3236b3e156340c94fb280f5392496c7692f3039 100644
--- a/module-services/service-evtmgr/EventManager.cpp
+++ b/module-services/service-evtmgr/EventManager.cpp
@@ -10,35 +10,37 @@
 
 #include "EventManager.hpp"
 
-#include "log/log.hpp"
-
-#include "bsp/keyboard/keyboard.hpp"
-#include "WorkerEvent.hpp"
-#include "messages/EVMessages.hpp"
-
-#include "vfs.hpp"
-
-#include "bsp/battery-charger/battery_charger.hpp"
-#include "service-appmgr/Controller.hpp"
-#include "service-db/api/DBServiceAPI.hpp"
-#include "service-db/messages/DBNotificationMessage.hpp"
-#include "AudioServiceAPI.hpp"
-
-#include "bsp/harness/bsp_harness.hpp"
-#include "harness/Parser.hpp"
-#include "harness/events/AtResponse.hpp"
-#include "harness/events/FocusApp.hpp"
-#include <service-cellular/messages/CellularMessage.hpp>
-#include <service-evtmgr/Constants.hpp>
-
-#include <cassert>
-
-#include "bsp/magnetometer/magnetometer.hpp"
-#include "bsp/cellular/bsp_cellular.hpp"
-#include "bsp/common.hpp"
-#include "bsp/rtc/rtc.hpp"
-
-#include <cassert>
+#include <service-cellular/messages/CellularMessage.hpp> // for CellularTimeNotificationMessage, RawCommandResp
+#include <service-evtmgr/Constants.hpp>                  // for evt_manager
+#include <cassert>                                       // for assert
+#include <list>                                          // for list
+#include <tuple>                                         // for tie, tuple
+#include <vector>                                        // for vector
+
+#include "log/log.hpp"             // for LOG_INFO, LOG_DEBUG, LOG_FATAL
+#include "WorkerEvent.hpp"         // for WorkerEvent
+#include "messages/EVMessages.hpp" // for TorchStateResultMessage, EVMFocusApplication, StatusStateMessage, EVMBoardResponseMessage, SIMMessage, TorchStateMessage
+#include "service-appmgr/Controller.hpp"                 // for Controller
+#include "service-db/messages/DBNotificationMessage.hpp" // for NotificationMessage
+#include "AudioServiceAPI.hpp"                           // for SendEvent
+#include "bsp/harness/bsp_harness.hpp"                   // for emit
+#include "harness/events/AtResponse.hpp"                 // for AtResponse
+#include "harness/events/FocusApp.hpp"                   // for FocusApp
+#include "bsp/magnetometer/magnetometer.hpp"             // for GetBoard
+#include "bsp/common.hpp"                                // for c_str
+#include "bsp/rtc/rtc.hpp"                               // for rtc_SetDateTime
+#include "BaseInterface.hpp"                             // for Interface, Interface::Name, Interface::Name::Alarms
+#include "MessageType.hpp" // for MessageType, MessageType::EVMModemStatus, MessageType::CellularTimeUpdated, MessageType::DBServiceNotification, MessageType::EVMBatteryLevel, MessageType::EVMChargerPlugged, MessageType::EVMFocusApplication, MessageType::EVMGetBoard, MessageType::EVMMinuteUpdated, MessageType::EVMRingIndicator, MessageType::EVMTimeUpdated, MessageType::EVMTorchStateMessage, MessageType::EVM_GPIO, MessageType::KBDKeyEvent
+#include "Service/Bus.hpp" // for Bus
+#include "Service/Worker.hpp"              // for WorkerQueueInfo
+#include "SystemManager/Constants.hpp"     // for system_manager
+#include "SystemManager/SystemManager.hpp" // for SystemManager
+#include "bsp/keyboard/key_codes.hpp"      // for KeyCodes, KeyCodes::FnRight, bsp
+#include "bsp/torch/torch.hpp" // for State, Action, getColorTemp, getState, toggle, turn, Action::getState, Action::setState, Action::toggle
+#include "common_data/RawKey.hpp"                      // for RawKey, RawKey::State, RawKey::State::Pressed
+#include "service-audio/messages/AudioMessage.hpp"     // for AudioEventRequest
+#include "service-evtmgr/messages/BatteryMessages.hpp" // for BatteryLevelMessage, BatteryPlugMessage
+#include "service-evtmgr/messages/KbdMessage.hpp"      // for KbdMessage
 
 EventManager::EventManager(const std::string &name) : sys::Service(name)
 {
diff --git a/module-services/service-evtmgr/EventManager.hpp b/module-services/service-evtmgr/EventManager.hpp
index 2adbcbc114e7579af8f68b20e4c66d7588ea5f8a..739be2c34cb50616bf38e1c7c6bbbfea5ce744ed 100644
--- a/module-services/service-evtmgr/EventManager.hpp
+++ b/module-services/service-evtmgr/EventManager.hpp
@@ -11,13 +11,18 @@
 #ifndef MODULE_SERVICES_SERVICE_KBD_EVENTMANAGER_HPP_
 #define MODULE_SERVICES_SERVICE_KBD_EVENTMANAGER_HPP_
 
+#include <stdint.h>    // for uint32_t
+#include <sys/types.h> // for time_t
+#include <memory>      // for unique_ptr
+#include <string>      // for string
+
 #include "bsp/keyboard/key_codes.hpp"
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for DataMessage (ptr only), Message_t, ResponseMessage (ptr only)
 #include "Service/Worker.hpp"
 #include "MessageType.hpp"
-
 #include "bsp/common.hpp"
+#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
 
 class WorkerEvent;
 
diff --git a/module-services/service-evtmgr/WorkerEvent.cpp b/module-services/service-evtmgr/WorkerEvent.cpp
index db4f61a466ffc80c4e7edaa8678234ff4d032db9..2bcb93409eac5752e2490a0f9f4c9a41ffbd05b7 100644
--- a/module-services/service-evtmgr/WorkerEvent.cpp
+++ b/module-services/service-evtmgr/WorkerEvent.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 /*
@@ -8,37 +8,45 @@
  *      Author: kuba
  */
 
-#include <string.h>
-
 extern "C"
 {
-#include "FreeRTOS.h"
-#include "task.h"
+#include "FreeRTOS.h" // for xQueueHandle
+#include "projdefs.h" // for pdTRUE
+#include "queue.h"    // for xQueueReceive, QueueDefinition, QueueHandle_t
+#include "task.h"     // for xTaskGetTickCount
 }
-
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-#include "Service/Worker.hpp"
-#include "MessageType.hpp"
-
+#include "Audio/AudioCommon.hpp"      // for EventType, EventType::HeadphonesPlugin, EventType::HeadphonesUnplug
+#include "common_data/EventStore.hpp" // for GSM, GSM::Tray
+#include "common_data/RawKey.hpp"     // for RawKey, RawKey::State, RawKey::State::Pressed, RawKey::State::Released
+//#include "harness/harness.hpp"                          // for ETX, STX
+#include "log/log.hpp"                                 // for LOG_DEBUG, LOG_ERROR
+#include "service-audio/messages/AudioMessage.hpp"     // for AudioEventRequest
+#include "service-evtmgr/messages/BatteryMessages.hpp" // for BatteryLevelMessage, BatteryPlugMessage
+#include "service-evtmgr/messages/KbdMessage.hpp"      // for KbdMessage
+
+#include <Service/Bus.hpp> // for Bus
+//#include <bits/types/struct_tm.h>                       // for tm
+#include <sys/types.h> // for time_t
+#include <memory>      // for make_shared, __shared_ptr_access, shared_ptr, allocator
+#include <optional>    // for optional
+#include <string>      // for string
+#include <vector>      // for vector
+
+#include "Service/Worker.hpp" // for WorkerQueueInfo, Worker, WorkerCommand
+#include "MessageType.hpp" // for MessageType, MessageType::EVMMinuteUpdated, MessageType::EVMModemStatus, MessageType::EVMRingIndicator
 #include "WorkerEvent.hpp"
-#include "EventManager.hpp"
-#include "service-evtmgr/messages/EVMessages.hpp"
-#include "AudioServiceAPI.hpp"
-
-#include "bsp/battery-charger/battery_charger.hpp"
-#include "bsp/cellular/bsp_cellular.hpp"
-#include "bsp/keyboard/keyboard.hpp"
-#include "headset.hpp"
-#include "bsp/rtc/rtc.hpp"
-#include "bsp/vibrator/vibrator.hpp"
-#include "bsp/magnetometer/magnetometer.hpp"
-#include "bsp/torch/torch.hpp"
-
-#include "Constants.hpp"
-#include "bsp/harness/bsp_harness.hpp"
-#include "harness/Parser.hpp"
-#include <Service/Bus.hpp>
+#include "service-evtmgr/messages/EVMessages.hpp"  // for StatusStateMessage, RtcMinuteAlarmMessage
+#include "bsp/battery-charger/battery_charger.hpp" // for battery_ClearAllIRQs, battery_Deinit, battery_Init, battery_getBatteryLevel, battery_getChargeStatus, batteryIRQSource, batteryIRQSource::INOKB, batteryIRQSource::INTB
+#include "bsp/cellular/bsp_cellular.hpp" // for getStatus, getTray, hotswap_trigger, init, ringIndicatorPin, statusPin, trayPin, value, value::ACTIVE
+#include "bsp/keyboard/keyboard.hpp" // for keyboard_Deinit, keyboard_Init, keyboard_get_data
+#include "headset.hpp"               // for Deinit, Handler, Init, IsInserted
+#include "bsp/rtc/rtc.hpp" // for rtc_GetCurrentTimestamp, rtc_SetMinuteAlarm, rtc_GetCurrentDateTime, rtc_Init
+#include "bsp/vibrator/vibrator.hpp"         // for init
+#include "bsp/magnetometer/magnetometer.hpp" // for WorkerEventHandler, init
+#include "bsp/torch/torch.hpp"               // for deinit, init
+#include "Constants.hpp"                     // for evt_manager
+#include "bsp/harness/bsp_harness.hpp"       // for Init, emit, flush, read
+#include "harness/Parser.hpp"                // for c_str, parse, Error, Error::Success
 
 bool WorkerEvent::handleMessage(uint32_t queueID)
 {
@@ -188,7 +196,7 @@ bool WorkerEvent::handleMessage(uint32_t queueID)
     return true;
 }
 
-#include "harness/events/SysStart.hpp"
+#include "harness/events/SysStart.hpp" // for SysStart
 
 bool WorkerEvent::init(std::list<sys::WorkerQueueInfo> queues)
 {
diff --git a/module-services/service-evtmgr/WorkerEvent.hpp b/module-services/service-evtmgr/WorkerEvent.hpp
index 97a5f457ae34cf9d71d1308bc7cb44bdf4a6dde8..655bea4daf792318fa9c179fcbb45b42a27c0097 100644
--- a/module-services/service-evtmgr/WorkerEvent.hpp
+++ b/module-services/service-evtmgr/WorkerEvent.hpp
@@ -11,15 +11,22 @@
 #ifndef MODULE_SERVICES_SERVICE_KBD_WorkerEvent_HPP_
 #define MODULE_SERVICES_SERVICE_KBD_WorkerEvent_HPP_
 
-#include "bsp/keyboard/key_codes.hpp"
+#include <stdint.h> // for uint32_t, uint8_t
+#include <list>     // for list
+#include <map>      // for map
+
+#include "bsp/keyboard/key_codes.hpp" // for KeyCodes
 #include "Service/Service.hpp"
 #include "Service/Message.hpp"
-#include "Service/Worker.hpp"
-
+#include "Service/Worker.hpp" // for Worker, WorkerQueueInfo (ptr only)
 #include "EventManager.hpp"
+#include "bsp/common.hpp"             // for KeyEvents, KeyEvents::Released
+#include "bsp/keyboard/key_codes.hpp" // for KeyCodes
 
-#include "bsp/common.hpp"
-#include "bsp/keyboard/key_codes.hpp"
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 struct KeyState
 {
diff --git a/module-services/service-evtmgr/alarm/EventManagerAlarm.cpp b/module-services/service-evtmgr/alarm/EventManagerAlarm.cpp
index 709c8b9147469382a2083a19fae652d004ef20a6..548d358677c573b1a309e1b35662275eb2fc1bde 100644
--- a/module-services/service-evtmgr/alarm/EventManagerAlarm.cpp
+++ b/module-services/service-evtmgr/alarm/EventManagerAlarm.cpp
@@ -8,18 +8,24 @@
  *      Author: kuba
  */
 
-#include "../EventManager.hpp"
+#include <sys/types.h> // for time_t
+#include <memory>      // for allocator, make_shared, make_unique, __shared_ptr_access, shared_ptr, unique_ptr
+#include <string>      // for string
+#include <utility>     // for move
 
-#include "log/log.hpp"
+#include "../EventManager.hpp"             // for EventManager
+#include "../messages/EVMessages.hpp"      // for RtcMinuteAlarmMessage, EVMAlarmSwitchData
+#include "service-db/api/DBServiceAPI.hpp" // for DBServiceAPI
+#include "service-appmgr/Controller.hpp"   // for Controller
+#include "AlarmsRecord.hpp"                // for AlarmsRecord
+#include "MessageType.hpp"                 // for MessageType, MessageType::EVMMinuteUpdated
+#include "Service/Bus.hpp"                 // for Bus
+#include "SwitchData.hpp"                  // for SwitchData
 
-#include "bsp/keyboard/keyboard.hpp"
-#include "../WorkerEvent.hpp"
-#include "../messages/EVMessages.hpp"
-
-#include "vfs.hpp"
-
-#include "service-db/api/DBServiceAPI.hpp"
-#include "service-appmgr/Controller.hpp"
+namespace sys
+{
+    class DataMessage;
+} // namespace sys
 
 void EventManager::HandleAlarmTrigger(sys::DataMessage *msgl)
 {
diff --git a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
index 736509d926941b6e00bd6d2af8adfc4f162fec14..9c8c94d4a9372a832e7c33efd9ead9d977f311fa 100644
--- a/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
+++ b/module-services/service-evtmgr/api/EventManagerServiceAPI.cpp
@@ -2,12 +2,22 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "EventManagerServiceAPI.hpp"
-#include <Service/Service.hpp>
-#include "../EventManager.hpp"
-#include "../messages/EVMessages.hpp"
 
-#include "../Constants.hpp"
-#include <Service/Bus.hpp>
+#include <Service/Bus.hpp> // for Bus
+#include <stdint.h>        // for uint32_t
+#include <memory>          // for make_shared, shared_ptr, __shared_ptr<>::element_type
+#include <utility>         // for pair
+
+#include "../messages/EVMessages.hpp" // for EVMBoardResponseMessage
+#include "../Constants.hpp"           // for evt_manager
+#include "MessageType.hpp"            // for MessageType, MessageType::EVMGetBoard
+#include "Service/Common.hpp"         // for ReturnCodes, ReturnCodes::Success
+#include "Service/Message.hpp"        // for DataMessage
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 bsp::Board EventManagerServiceAPI::GetBoard(sys::Service *serv)
 {
diff --git a/module-services/service-evtmgr/api/EventManagerServiceAPI.hpp b/module-services/service-evtmgr/api/EventManagerServiceAPI.hpp
index a724d21e216943baeaa3e59aed813e76c86022fd..cba375c9bbd7fbc9586f9fc3d27a1fe5548dd20c 100644
--- a/module-services/service-evtmgr/api/EventManagerServiceAPI.hpp
+++ b/module-services/service-evtmgr/api/EventManagerServiceAPI.hpp
@@ -5,7 +5,13 @@
 
 #include <MessageType.hpp>
 #include <Service/Message.hpp>
-#include "bsp/common.hpp"
+
+#include "bsp/common.hpp" // for Board
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace EventManagerServiceAPI
 {
diff --git a/module-services/service-evtmgr/harness/Parser.cpp b/module-services/service-evtmgr/harness/Parser.cpp
index 8849ff805138e5f74a0017b42845f817b1633e44..c8701c0c27f3594dbce313913721e073c2a86fd1 100644
--- a/module-services/service-evtmgr/harness/Parser.cpp
+++ b/module-services/service-evtmgr/harness/Parser.cpp
@@ -2,14 +2,23 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Parser.hpp"
-#include "Events.hpp"
-#include "actions/CellularCMD.hpp"
-#include "events/GPIO.hpp"
-#include "events/KeyPress.hpp"
-#include <Service/Bus.hpp>
-#include <json/json11.hpp>
-#include <log/log.hpp>
-#include <service-evtmgr/Constants.hpp>
+
+#include <Service/Bus.hpp>              // for Bus
+#include <json/json11.hpp>              // for Json, json11
+#include <log/log.hpp>                  // for LOG_DEBUG, LOG_ERROR
+#include <service-evtmgr/Constants.hpp> // for evt_manager
+#include <memory>                       // for shared_ptr
+
+#include "Events.hpp"              // for Events, Type, Data, Events::GPIO, Events::GSMCmd, Events::KeyPress
+#include "actions/CellularCMD.hpp" // for gsm_send
+#include "events/GPIO.hpp"         // for GPIO
+#include "events/KeyPress.hpp"     // for KeyPress
+
+namespace sys
+{
+    class DataMessage;
+    class Service;
+} // namespace sys
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/Parser.hpp b/module-services/service-evtmgr/harness/Parser.hpp
index 1183a5164d4b26ab23d46ff657d31b0d05e407af..d110d3127ab59145cd8600fe32627544a0abc22d 100644
--- a/module-services/service-evtmgr/harness/Parser.hpp
+++ b/module-services/service-evtmgr/harness/Parser.hpp
@@ -3,10 +3,16 @@
 
 #pragma once
 
-#include "Events.hpp"
 #include <Service/Message.hpp>
 #include <Service/Service.hpp>
-#include <string>
+#include <string> // for string
+
+#include "Events.hpp"
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/actions/CellularCMD.cpp b/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
index 4e667b96c88ef0b4209b87cd6ea08e9162b7e5e1..166ff2850e38831f783794e64215de46c137a87f 100644
--- a/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
+++ b/module-services/service-evtmgr/harness/actions/CellularCMD.cpp
@@ -2,9 +2,18 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "CellularCMD.hpp"
-#include <Service/Bus.hpp>
-#include <service-cellular/ServiceCellular.hpp>
-#include <service-cellular/api/CellularServiceAPI.hpp>
+
+#include <Service/Bus.hpp>                      // for Bus
+#include <service-cellular/ServiceCellular.hpp> // for ServiceCellular, ServiceCellular::serviceName
+#include <memory>                               // for allocator, make_shared, __shared_ptr_access, shared_ptr
+
+#include "log/log.hpp"                                   // for LOG_ERROR
+#include "service-cellular/messages/CellularMessage.hpp" // for RawCommand
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/actions/CellularCMD.hpp b/module-services/service-evtmgr/harness/actions/CellularCMD.hpp
index eeb9811b2630850b75f47bdd0b50c9b605ea890b..5906e3d9d9bc052f5eb5f016bf680198f18cbeea 100644
--- a/module-services/service-evtmgr/harness/actions/CellularCMD.hpp
+++ b/module-services/service-evtmgr/harness/actions/CellularCMD.hpp
@@ -3,6 +3,12 @@
 
 #pragma once
 #include <Service/Service.hpp>
+#include <string> // for string
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/events/AtResponse.cpp b/module-services/service-evtmgr/harness/events/AtResponse.cpp
index 26ea6bb3237225a518e438cdb58ffef3eebf08f0..3bbdbb5f96b77af97c38988ad845cfc6f34e7142 100644
--- a/module-services/service-evtmgr/harness/events/AtResponse.cpp
+++ b/module-services/service-evtmgr/harness/events/AtResponse.cpp
@@ -2,7 +2,11 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AtResponse.hpp"
-#include <json/json11.hpp>
+
+#include <json/json11.hpp> // for Json, Json::object
+#include <map>             // for map<>::mapped_type
+
+#include "service-evtmgr/harness/Events.hpp" // for Data, Type
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/events/FocusApp.cpp b/module-services/service-evtmgr/harness/events/FocusApp.cpp
index 0eeb54626a353ed7adaeb4b8d79d05e5fa15e193..f8b2606995ef0ba3c68595d7832ff08ce2fee694 100644
--- a/module-services/service-evtmgr/harness/events/FocusApp.cpp
+++ b/module-services/service-evtmgr/harness/events/FocusApp.cpp
@@ -2,7 +2,10 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "FocusApp.hpp"
-#include <json/json11.hpp>
+
+#include <json/json11.hpp> // for Json, Json::object, json11
+#include <map>             // for map<>::mapped_type
+#include <vector>          // for vector
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/events/FocusApp.hpp b/module-services/service-evtmgr/harness/events/FocusApp.hpp
index aa837fc044814dbc142360403b568272c47ba339..5fa1249f29f51eb802a7064dc493cf67fa24bb2c 100644
--- a/module-services/service-evtmgr/harness/events/FocusApp.hpp
+++ b/module-services/service-evtmgr/harness/events/FocusApp.hpp
@@ -3,7 +3,9 @@
 
 #pragma once
 
-#include "../Events.hpp"
+#include <string> // for string
+
+#include "../Events.hpp" // for Event, Events, Events::FocusApp
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/events/GPIO.cpp b/module-services/service-evtmgr/harness/events/GPIO.cpp
index 8e001456e80c7ba384231ee12be64dfd19146c94..853baf2ef0647d9840e063f2bf77e9a439b9a90d 100644
--- a/module-services/service-evtmgr/harness/events/GPIO.cpp
+++ b/module-services/service-evtmgr/harness/events/GPIO.cpp
@@ -2,11 +2,16 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "GPIO.hpp"
-#include "../../messages/EVMessages.hpp"
-#include <log/log.hpp>
-#include <map>
 
-#include "bsp/harness/bsp_harness.hpp"
+#include <log/log.hpp> // for LOG_DEBUG, LOG_ERROR
+#include <map>         // for map, map<>::mapped_type
+#include <memory>      // for shared_ptr, __shared_ptr_access, make_shared
+#include <utility>     // for pair
+
+#include "../../messages/EVMessages.hpp"     // for GPIO
+#include "bsp/harness/bsp_harness.hpp"       // for to, read, write
+#include "bsp/harness/bsp_pinmap.hpp"        // for harness
+#include "service-evtmgr/harness/Events.hpp" // for Data, Type
 
 namespace harness::events
 {
diff --git a/module-services/service-evtmgr/harness/events/GPIO.hpp b/module-services/service-evtmgr/harness/events/GPIO.hpp
index c96429a79e469c1862882d572c8c3e187b754388..b7f20dfc3f37d79b5dcbffa9c27cbc677b9d0936 100644
--- a/module-services/service-evtmgr/harness/events/GPIO.hpp
+++ b/module-services/service-evtmgr/harness/events/GPIO.hpp
@@ -3,7 +3,11 @@
 
 #pragma once
 
-#include "../Events.hpp"
+#include <map>    // for map
+#include <string> // for string, allocator
+
+#include "../Events.hpp"   // for Event, Events, Events::GPIO
+#include "json/json11.hpp" // for Json
 
 namespace harness::events
 {
diff --git a/module-services/service-evtmgr/harness/events/KeyPress.cpp b/module-services/service-evtmgr/harness/events/KeyPress.cpp
index a0c72305fc8a0ec3e1127f0fbcc19787558cc608..194e70af32501e4bbde319ba3a6bf83a1bb4a364 100644
--- a/module-services/service-evtmgr/harness/events/KeyPress.cpp
+++ b/module-services/service-evtmgr/harness/events/KeyPress.cpp
@@ -2,8 +2,14 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "KeyPress.hpp"
-#include "../../messages/EVMessages.hpp"
-#include "../Events.hpp"
+
+#include <map>    // for map<>::mapped_type
+#include <memory> // for make_shared, shared_ptr, __shared_ptr_access
+
+#include "../Events.hpp"              // for Data, Type
+#include "bsp/keyboard/key_codes.hpp" // for KeyCodes, KeyCodes::FnLeft, KeyCodes::FnRight, KeyCodes::JoystickDown, KeyCodes::JoystickEnter, KeyCodes::JoystickLeft, KeyCodes::JoystickRight, KeyCodes::JoystickUp, KeyCodes::NumericKey0, KeyCodes::NumericKey1, KeyCodes::NumericKey2, KeyCodes::NumericKey3, KeyCodes::NumericKey4, KeyCodes::NumericKey5, KeyCodes::NumericKey6, KeyCodes::NumericKey7, KeyCodes::NumericKey8, KeyCodes::NumericKey9, KeyCodes::NumericKeyAst, KeyCodes::NumericKeyPnd, KeyCodes::SSwitchDown, KeyCodes::SSwitchMid, KeyCodes::SSwitchUp, KeyCodes::Torch, KeyCodes::Undefined, KeyCodes::VolDown, KeyCodes::VolUp
+#include "common_data/RawKey.hpp"     // for RawKey, RawKey::State, RawKey::State::Released
+#include "service-evtmgr/messages/KbdMessage.hpp" // for KbdMessage
 
 namespace harness::events
 {
diff --git a/module-services/service-evtmgr/harness/events/KeyPress.hpp b/module-services/service-evtmgr/harness/events/KeyPress.hpp
index b318ffb36d2e4610c3155accf77129e6cadd9a18..4b2ccdb7e3c7969c35baa4514f3dfc14a558001f 100644
--- a/module-services/service-evtmgr/harness/events/KeyPress.hpp
+++ b/module-services/service-evtmgr/harness/events/KeyPress.hpp
@@ -3,7 +3,10 @@
 
 #pragma once
 
-#include "../Events.hpp"
+#include <string> // for string
+
+#include "../Events.hpp"   // for Event, Events, Events::KeyPress
+#include "json/json11.hpp" // for Json
 
 namespace harness::events
 {
diff --git a/module-services/service-evtmgr/harness/events/SysStart.cpp b/module-services/service-evtmgr/harness/events/SysStart.cpp
index 337599ae1afa35c36be93a55f4d229e4f148efb8..d2feca52b8cd34c99256c80ed7c4e80beb53ed12 100644
--- a/module-services/service-evtmgr/harness/events/SysStart.cpp
+++ b/module-services/service-evtmgr/harness/events/SysStart.cpp
@@ -2,7 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "SysStart.hpp"
-#include <json/json11.hpp>
+
+#include <json/json11.hpp> // for Json, Json::object, json11
+#include <map>             // for map<>::mapped_type
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/harness/events/SysStart.hpp b/module-services/service-evtmgr/harness/events/SysStart.hpp
index 7c6d0d66f3c4b5a0f874b25f603c6b23e419fb87..bd265a94c211f34dad6e9ab867b69905e9084328 100644
--- a/module-services/service-evtmgr/harness/events/SysStart.hpp
+++ b/module-services/service-evtmgr/harness/events/SysStart.hpp
@@ -3,7 +3,9 @@
 
 #pragma once
 
-#include "../Events.hpp"
+#include <string> // for string
+
+#include "../Events.hpp" // for Event, Events, Events::SysStart
 
 namespace harness
 {
diff --git a/module-services/service-evtmgr/messages/Message.cpp b/module-services/service-evtmgr/messages/Message.cpp
index ca126dece46307d63d946c85982431e1eca748e7..ba7c094cea0c9fe56bdb3cf13cb497c9c584cc63 100644
--- a/module-services/service-evtmgr/messages/Message.cpp
+++ b/module-services/service-evtmgr/messages/Message.cpp
@@ -2,7 +2,9 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "Message.hpp"
-#include <Service/Service.hpp>
+
+#include "MessageType.hpp"     // for MessageType
+#include "Service/Message.hpp" // for DataMessage
 
 namespace sevm
 {
diff --git a/module-services/service-fota/ServiceFota.cpp b/module-services/service-fota/ServiceFota.cpp
index 4e852280cfad2750a50eb20637865853bb07e12b..0e916a4bd0f68e4d96052de285c0919dee42aea1 100644
--- a/module-services/service-fota/ServiceFota.cpp
+++ b/module-services/service-fota/ServiceFota.cpp
@@ -1,31 +1,34 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Service/Timer.hpp"
-#include "api/FotaServiceAPI.hpp"
-
+#include <Service/Bus.hpp>                             // for Bus
+#include <module-cellular/at/Result.hpp>               // for Result, Result::Code, Result::Code::OK
+#include <module-cellular/at/URC_QIND.hpp>             // for QIND
+#include <service-cellular/api/CellularServiceAPI.hpp> // for GetDataChannel
+#include <bits/exception.h>                            // for exception
+#include <algorithm>                                   // for find_if, remove, transform
+#include <cctype>                                      // for tolower
+#include <functional>                                  // for _Bind_helper<>::type, _Placeholder, bind, _1, _2
+#include <numeric>                                     // for accumulate
+#include <sstream> // for operator<<, basic_ostream, ostringstream, basic_ostream::operator<<, char_traits, basic_istream, istringstream, basic_ostream<>::__ostream_type
+#include <string>  // for string, basic_string, stoi, getline, operator<<, operator==, operator+, operator!=
+#include <unordered_map> // for unordered_map<>::iterator, _Node_iterator, operator==, _Map_base<>::mapped_type, _Node_iterator_base, unordered_map<>::mapped_type
+#include <utility>       // for move, pair
+#include <vector>        // for vector
+
+#include "Service/Timer.hpp"      // for Timer
+#include "api/FotaServiceAPI.hpp" // for Config, ContextMap, ContextType, HTTPMethod, ContextPair, HTTPMethod::GET, AuthMethod, HTTPErrors, HTTPErrors::OK, HTTPMethod::POST
 #include "ServiceFota.hpp"
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-
-#include <Service/Bus.hpp>
-#include <module-cellular/Modem/TS0710/TS0710.h>
-#include <module-cellular/at/Result.hpp>
-#include <module-cellular/at/URC_QIND.hpp>
-#include <service-cellular/api/CellularServiceAPI.hpp>
-
-#include "MessageType.hpp"
-
-#include "messages/FotaMessages.hpp"
-
-#include <algorithm>
-#include <cctype>
-#include <functional>
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <string>
-#include <sstream>
+#include "Service/Service.hpp"       // for Service
+#include "Service/Message.hpp"       // for Message_t, DataMessage, ResponseMessage
+#include "MessageType.hpp"           // for MessageType, MessageType::CellularListCurrentCalls
+#include "messages/FotaMessages.hpp" // for FotaResponseMessage, HTTPRequestMessage, ConfigureAPNMessage, HTTPResponseMessage, NotificationMessage, FOTAStart, FOTAProgres, FOTAFinished, FOTARawProgress, InternetRequestMessage, NotificationMessage::Type, ConnectMessage, NotificationMessage::Type::Configured, NotificationMessage::Type::Connected
+#include "Commands.hpp"              // for AT, AT::QIGETERROR
+#include "Modem/TS0710/DLC_channel.h"                    // for DLC_channel
+#include "log/log.hpp"                                   // for LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR
+#include "portmacro.h"                                   // for TickType_t
+#include "service-cellular/State.hpp"                    // for State, State::ST, State::ST::Ready
+#include "service-cellular/messages/CellularMessage.hpp" // for CellularGetChannelResponseMessage, StateChange
 
 namespace FotaService
 {
diff --git a/module-services/service-fota/ServiceFota.hpp b/module-services/service-fota/ServiceFota.hpp
index 40b8c0c2f6ee5d7c1b1ae65591ccbfda35ac806b..72dd41c47542030872c5fceab391f08ba5d39c25 100644
--- a/module-services/service-fota/ServiceFota.hpp
+++ b/module-services/service-fota/ServiceFota.hpp
@@ -3,17 +3,25 @@
 
 #pragma once
 
-#include "api/FotaServiceAPI.hpp"
-
 #include <service-cellular/ServiceCellular.hpp>
-
 #include <Modem/TS0710/DLC_channel.h>
 #include <Modem/TS0710/TS0710.h>
-#include <Service/Service.hpp>
-#include <Service/Message.hpp>
-
-#include <memory>
+#include <Service/Service.hpp> // for Service
+#include <Service/Message.hpp> // for Message_t
+#include <stdint.h>            // for uint32_t
+#include <memory>              // for unique_ptr
 #include <sstream>
+#include <string> // for string
+
+#include "api/FotaServiceAPI.hpp" // for ContextMap
+#include "Result.hpp"             // for Result
+#include "Service/Common.hpp"     // for ReturnCodes, ReturnCodes::Success, ServicePowerMode
+
+class DLC_channel;
+namespace sys
+{
+    class Timer;
+} // namespace sys
 
 namespace FotaService
 {
diff --git a/module-services/service-fota/api/FotaServiceAPI.cpp b/module-services/service-fota/api/FotaServiceAPI.cpp
index 2ff8983709608b0704697dc5c564c46dfdf7689b..1d9fd6c114029b50861ead5a4e82aeb7b69df272 100644
--- a/module-services/service-fota/api/FotaServiceAPI.cpp
+++ b/module-services/service-fota/api/FotaServiceAPI.cpp
@@ -3,14 +3,15 @@
 
 #include "FotaServiceAPI.hpp"
 
-#include <service-fota/ServiceFota.hpp>
-#include <service-fota/messages/FotaMessages.hpp>
-#include <service-cellular/messages/CellularMessage.hpp>
-#include <service-cellular/ServiceCellular.hpp>
-#include <Service/Bus.hpp>
-
-#include <sstream>
-#include <string>
+#include <service-fota/ServiceFota.hpp> // for Service, Service::serviceName
+#include <service-fota/messages/FotaMessages.hpp> // for HTTPRequestMessage, FOTARawProgress, FOTAStart, ConfigureAPNMessage, ConnectMessage, InternetRequestMessage
+#include <Service/Bus.hpp> // for Bus
+#include <sstream> // for operator<<, basic_ostream, basic_ostream::operator<<, ostringstream, basic_ostream<>::__ostream_type
+#include <string> // for allocator, string, operator<<, char_traits, operator+, to_string
+#include <memory> // for make_shared, shared_ptr, __shared_ptr_access
+
+#include "MessageType.hpp" // for MessageType, MessageType::FotaInternetDisconnect
+#include "log/log.hpp"     // for LOG_DEBUG
 
 namespace FotaService
 {
diff --git a/module-services/service-fota/api/FotaServiceAPI.hpp b/module-services/service-fota/api/FotaServiceAPI.hpp
index 2958c0611c5820d6fec509f747c25733b4019d7c..465219d14f361c2a4cf5c856d82a68113c7a55c4 100644
--- a/module-services/service-fota/api/FotaServiceAPI.hpp
+++ b/module-services/service-fota/api/FotaServiceAPI.hpp
@@ -3,10 +3,11 @@
 
 #pragma once
 
-#include <string>
+#include <string> // for string
 #include <sstream>
-#include <unordered_map>
+#include <unordered_map> // for unordered_map
 #include <vector>
+#include <utility> // for pair
 
 namespace sys
 {
diff --git a/module-services/service-gui/ServiceGUI.cpp b/module-services/service-gui/ServiceGUI.cpp
index d5dd637223f2a92f77a9c8b413545c6598ebaab5..9b49aa39df649a7e53948185b6db46a28fda8954 100644
--- a/module-services/service-gui/ServiceGUI.cpp
+++ b/module-services/service-gui/ServiceGUI.cpp
@@ -1,34 +1,37 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <memory>
-
-// module-os
-#include "FreeRTOS.h"
-#include "semphr.h"
+#include <FontManager.hpp> // for FontManager
+#include <stddef.h>        // for NULL
+#include <memory>          // for unique_ptr, make_shared, allocator
+#include <list>            // for list, operator!=, _List_iterator, _List_iterator<>::_Self
+#include <utility>         // for move, pair
 
+extern "C"
+{
+#include <FreeRTOS.h>
+#include <semphr.h> // for xSemaphoreGive, vSemaphoreDelete, xSemaphoreCreateBinary, xSemaphoreTake
+}
 // module-gui
-#include "gui/core/Context.hpp"
-#include "gui/input/Translator.hpp"
-
+#include "gui/core/Context.hpp" // for Context
 // gui service
-#include "messages/GUIMessage.hpp"
-#include "messages/DrawMessage.hpp"
-
+#include "messages/GUIMessage.hpp" // for GUIMessage
+#include "messages/DrawMessage.hpp" // for DrawMessage, DrawMessage::DrawCommand, DrawMessage::DrawCommand::SHUTDOWN, DrawMessage::DrawCommand::SUSPEND
 // service-eink
-#include "service-eink/messages/ImageMessage.hpp"
-
+#include "service-eink/messages/ImageMessage.hpp" // for ImageMessage
 #include "ServiceGUI.hpp"
-#include "service-appmgr/Controller.hpp"
-
-#include "../gui/core/ImageManager.hpp"
-#include "log/log.hpp"
-
-#include "memory/usermem.h"
-
-#include "SystemManager/SystemManager.hpp"
-#include "WorkerGUI.hpp"
-#include <FontManager.hpp>
+#include "service-appmgr/Controller.hpp"   // for Controller
+#include "../gui/core/ImageManager.hpp"    // for ImageManager
+#include "log/log.hpp"                     // for LOG_WARN, LOG_DEBUG, LOG_FATAL, LOG_INFO, LOG_ERROR
+#include "SystemManager/SystemManager.hpp" // for SystemManager
+#include "WorkerGUI.hpp"                   // for WorkerGUI, WorkerGUICommands, WorkerGUICommands::Render
+#include "DrawCommand.hpp"                 // for DrawCommand
+#include "MessageType.hpp" // for MessageType, MessageType::EinkStateRequest, MessageType::GUICommands, MessageType::GUIDisplayReady, MessageType::GUIFocusInfo, MessageType::GUIRenderingFinished, MessageType::MessageTypeUninitialized
+#include "Service/Bus.hpp" // for Bus
+#include "Service/Worker.hpp"       // for WorkerQueueInfo
+#include "messages/EinkMessage.hpp" // for EinkMessage
+#include "projdefs.h"               // for pdMS_TO_TICKS, pdTRUE
+#include "task.h"                   // for xTaskGetTickCount
 
 namespace sgui
 {
diff --git a/module-services/service-gui/ServiceGUI.hpp b/module-services/service-gui/ServiceGUI.hpp
index f7e71eca9afda1b3ad37753eeda2bdeec823cb3c..8b2fa574891bb864189920c6b9a086ce74207e7d 100644
--- a/module-services/service-gui/ServiceGUI.hpp
+++ b/module-services/service-gui/ServiceGUI.hpp
@@ -11,17 +11,29 @@
 #ifndef MODULE_SERVICES_SERVICE_GUI_SERVICEGUI_HPP_
 #define MODULE_SERVICES_SERVICE_GUI_SERVICEGUI_HPP_
 
-#include <memory>
+#include <stdint.h> // for uint32_t
+#include <memory>   // for allocator, unique_ptr
+#include <string>   // for string
+#include <vector>   // for vector
 
 // module-gui
 #include "gui/core/Context.hpp"
-#include "gui/core/Renderer.hpp"
+#include "gui/core/Renderer.hpp" // for Renderer
 #include "gui/input/Translator.hpp"
 #include "messages/DrawMessage.hpp"
-
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
 #include "WorkerGUI.hpp"
+#include "Common.hpp"         // for RefreshModes, RefreshModes::GUI_REFRESH_DEEP
+#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
+#include "queue.h"            // for QueueDefinition
+#include "semphr.h"           // for SemaphoreHandle_t
+
+namespace gui
+{
+    class Context;
+    class DrawCommand;
+} // namespace gui
 
 namespace sgui
 {
diff --git a/module-services/service-gui/WorkerGUI.cpp b/module-services/service-gui/WorkerGUI.cpp
index 77860c4887eed681aca5da0ba7896b86467f1e23..3246d8973ad0202bd8410ddfc643a8be3e2a8cdc 100644
--- a/module-services/service-gui/WorkerGUI.cpp
+++ b/module-services/service-gui/WorkerGUI.cpp
@@ -1,22 +1,28 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <string.h>
-
 extern "C"
 {
-#include "FreeRTOS.h"
-#include "task.h"
 }
 
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-#include "Service/Worker.hpp"
-#include "MessageType.hpp"
+#include <Service/Bus.hpp> // for Bus
+#include <memory>          // for unique_ptr, make_shared
+#include <utility>         // for move
+#include <vector>          // for vector
+
+#include "Service/Service.hpp" // for Service
+#include "Service/Message.hpp" // for DataMessage
+#include "Service/Worker.hpp"  // for Worker, WorkerCommand
+#include "MessageType.hpp"     // for MessageType, MessageType::GUIRenderingFinished
 #include "WorkerGUI.hpp"
 // module-utils
-#include "log/log.hpp"
-#include <Service/Bus.hpp>
+#include "log/log.hpp"                // for LOG_ERROR
+#include "DrawCommand.hpp"            // for DrawCommand
+#include "Renderer.hpp"               // for Renderer
+#include "projdefs.h"                 // for pdMS_TO_TICKS, pdTRUE
+#include "queue.h"                    // for xQueueReceive, QueueDefinition, QueueHandle_t
+#include "semphr.h"                   // for xSemaphoreGive, xSemaphoreTake
+#include "service-gui/ServiceGUI.hpp" // for ServiceGUI
 
 namespace sgui
 {
diff --git a/module-services/service-gui/WorkerGUI.hpp b/module-services/service-gui/WorkerGUI.hpp
index d5719af8b4829eac371604055a17c97663114b3b..33ec31b2dcabea9a946f53bc8ba973609a601044 100644
--- a/module-services/service-gui/WorkerGUI.hpp
+++ b/module-services/service-gui/WorkerGUI.hpp
@@ -4,12 +4,14 @@
 #ifndef MODULE_SERVICES_SERVICE_GUI_WORKERGUI_HPP_
 #define MODULE_SERVICES_SERVICE_GUI_WORKERGUI_HPP_
 
+#include <stdint.h> // for uint32_t
+
 #include "core/DrawCommand.hpp"
 #include "core/Context.hpp"
 #include "messages/GUIMessage.hpp"
 #include "ServiceGUI.hpp"
-#include "Service/Worker.hpp"
-#include "gui/core/Renderer.hpp"
+#include "Service/Worker.hpp"    // for Worker
+#include "gui/core/Renderer.hpp" // for Renderer
 
 namespace sgui
 {
diff --git a/module-services/service-gui/messages/DrawMessage.cpp b/module-services/service-gui/messages/DrawMessage.cpp
index 8818f7a577ad9639c2e60c2e34b1426cf6e3fd79..d1287ed9ecb933edb218f9933d30b43272ef0f78 100644
--- a/module-services/service-gui/messages/DrawMessage.cpp
+++ b/module-services/service-gui/messages/DrawMessage.cpp
@@ -1,9 +1,11 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "GUIMessage.hpp"
+#include "GUIMessage.hpp" // for GUIMessage
 #include "DrawMessage.hpp"
-#include "MessageType.hpp"
+#include "MessageType.hpp" // for MessageType, MessageType::GUICommands
+#include "Common.hpp"      // for RefreshModes
+#include "DrawCommand.hpp" // for DrawCommand
 
 namespace sgui
 {
diff --git a/module-services/service-gui/messages/DrawMessage.hpp b/module-services/service-gui/messages/DrawMessage.hpp
index cb5721d39c3d780488c38821f8636f53498ad596..20731edca83feba9a6df3ca4ebae8d2f53f30e03 100644
--- a/module-services/service-gui/messages/DrawMessage.hpp
+++ b/module-services/service-gui/messages/DrawMessage.hpp
@@ -4,13 +4,18 @@
 #ifndef MODULE_SERVICES_SERVICE_GUI_DRAWMESSAGE_HPP_
 #define MODULE_SERVICES_SERVICE_GUI_DRAWMESSAGE_HPP_
 
-#include <list>
-#include <memory>
+#include <list>   // for list
+#include <memory> // for unique_ptr
 
 #include "Service/Message.hpp"
 #include "core/DrawCommand.hpp"
-#include "GUIMessage.hpp"
-#include "gui/Common.hpp"
+#include "GUIMessage.hpp" // for GUIMessage
+#include "gui/Common.hpp" // for RefreshModes
+
+namespace gui
+{
+    class DrawCommand;
+} // namespace gui
 
 namespace sgui
 {
diff --git a/module-services/service-lwip/ServiceLwIP.cpp b/module-services/service-lwip/ServiceLwIP.cpp
index 3d3567ef557d6ee7598a20537d0ab8d27ffef02e..91c83e69262b30e2fce5e0dbd88aeaaeebebaa96 100644
--- a/module-services/service-lwip/ServiceLwIP.cpp
+++ b/module-services/service-lwip/ServiceLwIP.cpp
@@ -2,21 +2,26 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ServiceLwIP.hpp"
-#include <log/log.hpp>
-#include "MessageType.hpp"
-#include "Service/Message.hpp"
-#include "Service/Service.hpp"
+
+#include <log/log.hpp>      // for LOG_ERROR, LOG_INFO
+#include <bits/exception.h> // for exception
+#include <stddef.h>         // for NULL
+
+#include "MessageType.hpp"     // for MessageType, MessageType::LwIP_request
+#include "Service/Message.hpp" // for ResponseMessage, DataMessage, Message_t
+#include "Service/Service.hpp" // for Service
 
 extern "C"
 {
-#include "dhcp-server/dhserver.h"
-#include "lwip/apps/httpd.h"
-#include "lwip/init.h"
-#include "lwip/opt.h"
-#include "lwip/tcpip.h"
+#include "dhcp-server/dhserver.h" // for dhserv_init, dhcp_config_t, dhcp_entry_t
+#include "lwip/apps/httpd.h"      // for httpd_init
+#include "lwip/tcpip.h"           // for tcpip_init
 };
 
-#include <Service/Bus.hpp>
+#include <Service/Bus.hpp> // for Bus
+#include <memory>          // for make_shared, allocator, shared_ptr
+#include <string>          // for string
+#include <utility>         // for pair
 
 #define NUM_DHCP_ENTRY 3
 
diff --git a/module-services/service-lwip/ServiceLwIP.hpp b/module-services/service-lwip/ServiceLwIP.hpp
index a024bc9bb250c2ce66bba7facd8372f2f21e4a16..df8e22aa7856f4142c175a3eb376e337f2173ce0 100644
--- a/module-services/service-lwip/ServiceLwIP.hpp
+++ b/module-services/service-lwip/ServiceLwIP.hpp
@@ -4,9 +4,11 @@
 #pragma once
 
 #include <memory>
-#include "MessageType.hpp"
-#include "Service/Message.hpp"
-#include "Service/Service.hpp"
+
+#include "MessageType.hpp"     // for MessageType, MessageType::LwIP_request
+#include "Service/Message.hpp" // for DataMessage, Message_t, ResponseMessage (ptr only)
+#include "Service/Service.hpp" // for Service
+#include "Service/Common.hpp"  // for ReturnCodes, ServicePowerMode
 
 class LwIP_message : public sys::DataMessage
 {
diff --git a/module-services/service-time/ServiceTime.cpp b/module-services/service-time/ServiceTime.cpp
index 85440099f9dcb9ed0c9cd0fb525ee2d1a185c617..2993bccdeb388a88a6dba0e76da6edf97aded13f 100644
--- a/module-services/service-time/ServiceTime.cpp
+++ b/module-services/service-time/ServiceTime.cpp
@@ -2,12 +2,20 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "ServiceTime.hpp"
-#include "messages/TimeMessage.hpp"
-#include <vector>
 
-#include "service-db/messages/DBNotificationMessage.hpp"
-#include "service-db/messages/QueryMessage.hpp"
-#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
+#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp> // for SelectFirstUpcomingResult
+#include <vector>                                                        // for vector
+#include <memory>  // for make_shared, shared_ptr, operator!=, __shared_ptr_access, unique_ptr
+#include <utility> // for move
+
+#include "messages/TimeMessage.hpp"                      // for TimeResponseMessage
+#include "service-db/messages/DBNotificationMessage.hpp" // for NotificationMessage
+#include "service-db/messages/QueryMessage.hpp"          // for QueryResponse
+#include "BaseInterface.hpp"                             // for Interface, Interface::Name, Interface::Name::Events
+#include "Common/Query.hpp"                              // for QueryResult
+#include "MessageType.hpp" // for MessageType, MessageType::DBServiceNotification, MessageType::ReloadTimers, MessageType::TimersProcessingStart, MessageType::TimersProcessingStop
+#include "log/log.hpp"     // for LOG_INFO, LOG_FATAL
+#include "service-time/timeEvents/CalendarTimeEvents.hpp" // for CalendarTimeEvents
 
 namespace stm
 {
diff --git a/module-services/service-time/ServiceTime.hpp b/module-services/service-time/ServiceTime.hpp
index b8b946783f5bf9f7ac75b889fe442389330c5ded..f26b25f81ca890bf55c80b9a4488dfe11b8d826a 100644
--- a/module-services/service-time/ServiceTime.hpp
+++ b/module-services/service-time/ServiceTime.hpp
@@ -2,15 +2,19 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Service/Service.hpp"
-#include "ServiceTime.hpp"
-#include <functional>
-#include "MessageType.hpp"
-#include "timeEvents/CalendarTimeEvents.hpp"
-
 #include <module-db/queries/calendar/QueryEventsGet.hpp>
 #include <module-db/queries/calendar/QueryEventsEdit.hpp>
 #include <module-sys/Service/Timer.hpp>
+#include <functional>
+#include <string> // for allocator, string
+
+#include "Service/Service.hpp" // for Service
+#include "ServiceTime.hpp"
+#include "MessageType.hpp"
+#include "timeEvents/CalendarTimeEvents.hpp" // for CalendarTimeEvents
+#include "Service/Common.hpp"                // for ReturnCodes, ServicePowerMode
+#include "Service/Message.hpp"               // for Message_t, DataMessage (ptr only), ResponseMessage (ptr only)
+#include "service-time/ServiceTime.hpp"
 
 namespace service::name
 {
diff --git a/module-services/service-time/timeEvents/CalendarTimeEvents.cpp b/module-services/service-time/timeEvents/CalendarTimeEvents.cpp
index 5c7dc3ee779b95f9cc97bd782056bbade0a63b25..0af079108959c830c067ba0863afeebf3db72615 100644
--- a/module-services/service-time/timeEvents/CalendarTimeEvents.cpp
+++ b/module-services/service-time/timeEvents/CalendarTimeEvents.cpp
@@ -3,15 +3,29 @@
 
 #include "CalendarTimeEvents.hpp"
 
-#include <module-services/service-appmgr/Controller.hpp>
-#include <module-services/service-db/api/DBServiceAPI.hpp>
-#include <module-services/service-db/messages/DBNotificationMessage.hpp>
-#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
+#include <module-services/service-appmgr/Controller.hpp>                 // for Controller
+#include <module-services/service-db/api/DBServiceAPI.hpp>               // for DBServiceAPI
+#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp> // for SelectFirstUpcoming, SelectFirstUpcomingResult
+#include <module-gui/gui/SwitchData.hpp>                                 // for SwitchData
+#include <module-apps/application-calendar/data/CalendarData.hpp>        // for EventRecordData
+#include <module-apps/application-calendar/ApplicationCalendar.hpp> // for name_calendar
+#include <module-apps/application-calendar/data/dateCommon.hpp>     // for TimePointNow, TimePoint, TIME_POINT_INVALID
+#include <algorithm>                                                // for min
+#include <chrono> // for duration, milliseconds, operator-, operator<, time_point, duration_cast, operator!=, minutes, operator""ms
+#include <type_traits> // for __success_type<>::type
+#include <utility>     // for move
+#include <vector>      // for vector
 
-#include <module-gui/gui/SwitchData.hpp>
-#include <module-apps/application-calendar/data/CalendarData.hpp>
-#include <module-apps/application-calendar/ApplicationCalendar.hpp>
-#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include "BaseInterface.hpp"                              // for Interface, Interface::Name, Interface::Name::Events
+#include "Common/Query.hpp"                               // for Query, QueryResult
+#include "application-calendar/widgets/CalendarStyle.hpp" // for event_reminder_window
+#include "queries/calendar/QueryEventsEdit.hpp"           // for Edit
+#include "service-time/timeEvents/TimeEvents.hpp"         // for TimeEvents
+
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace stm
 {
diff --git a/module-services/service-time/timeEvents/CalendarTimeEvents.hpp b/module-services/service-time/timeEvents/CalendarTimeEvents.hpp
index 4d6e92ec5a4c3103edafe77a9255031d1534a916..dae84fe071fd7350a2e7dec0c2c3d46c69d3f622 100644
--- a/module-services/service-time/timeEvents/CalendarTimeEvents.hpp
+++ b/module-services/service-time/timeEvents/CalendarTimeEvents.hpp
@@ -2,8 +2,23 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "TimeEvents.hpp"
 #include <module-db/queries/calendar/QueryEventsEdit.hpp>
+#include <stdint.h> // for uint32_t
+#include <memory>   // for allocator, unique_ptr
+#include <string>   // for string
+
+#include "TimeEvents.hpp"                           // for TimeEvents
+#include "EventsRecord.hpp"                         // for EventsRecord
+#include "application-calendar/data/dateCommon.hpp" // for TIME_POINT_INVALID, TimePoint
+
+namespace db
+{
+    class QueryResult;
+} // namespace db
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace stm
 {
diff --git a/module-services/service-time/timeEvents/TimeEvents.cpp b/module-services/service-time/timeEvents/TimeEvents.cpp
index 2b3696cfe6d748a52e92c099ff00570c9cb8ada6..48fe10d78d04f9963a813087a637c91964e87132 100644
--- a/module-services/service-time/timeEvents/TimeEvents.cpp
+++ b/module-services/service-time/timeEvents/TimeEvents.cpp
@@ -3,6 +3,16 @@
 
 #include "TimeEvents.hpp"
 
+#include <utility> // for move
+
+#include "Common/Query.hpp"  // for QueryResult
+#include "Service/Timer.hpp" // for Timer, Timer::Type, Timer::Type::SingleShot
+
+namespace sys
+{
+    class Service;
+} // namespace sys
+
 namespace stm
 {
     constexpr static const int eventTimerInitInterval = 1000;
diff --git a/module-services/service-time/timeEvents/TimeEvents.hpp b/module-services/service-time/timeEvents/TimeEvents.hpp
index 4ccd16bb12c0b5ec10f7289c05ddeb0732ab09c1..143337f6eeefaed77bece5b4d5d5c4fa5eb469f3 100644
--- a/module-services/service-time/timeEvents/TimeEvents.hpp
+++ b/module-services/service-time/timeEvents/TimeEvents.hpp
@@ -2,9 +2,22 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Service/Service.hpp"
 #include <module-db/queries/calendar/QueryEventsEdit.hpp>
-#include <module-sys/Service/Timer.hpp>
+#include <module-sys/Service/Timer.hpp> // for Timer
+#include <stdint.h>                     // for uint32_t
+#include <memory>                       // for unique_ptr
+#include <string>                       // for string
+
+#include "Service/Service.hpp"
+
+namespace db
+{
+    class QueryResult;
+} // namespace db
+namespace sys
+{
+    class Service;
+} // namespace sys
 
 namespace stm
 {