1 files changed, 20 insertions, 20 deletions

diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h
index 2d6e0b938e..92a38a32fc 100644
--- a/src/appMain/life_cycle.h
+++ b/src/appMain/life_cycle.h
@@ -32,38 +32,27 @@
 
 #ifndef SRC_APPMAIN_LIFE_CYCLE_H_
 #define SRC_APPMAIN_LIFE_CYCLE_H_
-#include "utils/macro.h"
-#include "unistd.h"
 
-#include "config_profile/profile.h"
-#include "hmi_message_handler/hmi_message_handler_impl.h"
 #ifdef DBUS_HMIADAPTER
 #include "hmi_message_handler/dbus_message_adapter.h"
 #endif  // DBUS_HMIADAPTER
-#if (defined(MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI))
+
+#ifdef MESSAGEBROKER_HMIADAPTER
 #include "hmi_message_handler/messagebroker_adapter.h"
-#endif  // #if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI)  )
+#include "CMessageBroker.hpp"
+#include "mb_tcpserver.hpp"
+#include "networking.h"  // cpplint: Include the directory when naming .h files
+#include "system.h"      // cpplint: Include the directory when naming .h files
+#endif                   // MESSAGEBROKER_HMIADAPTER
+
 #ifdef MQUEUE_HMIADAPTER
 #include "hmi_message_handler/mqueue_adapter.h"
 #endif  // MQUEUE_HMIADAPTER
-#include "application_manager/application_manager_impl.h"
-#include "connection_handler/connection_handler_impl.h"
-#include "protocol_handler/protocol_handler_impl.h"
-#include "transport_manager/transport_manager.h"
-#include "transport_manager/transport_manager_default.h"
-#include "media_manager/media_manager_impl.h"
+
 #ifdef TELEMETRY_MONITOR
 #include "telemetry_monitor/telemetry_monitor.h"
 #endif
 
-//#if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI)  )
-#ifdef MESSAGEBROKER_HMIADAPTER
-#include "CMessageBroker.hpp"
-#include "mb_tcpserver.hpp"
-#include "networking.h"  // cpplint: Include the directory when naming .h files
-#endif                   // MESSAGEBROKER_HMIADAPTER
-#include "system.h"      // cpplint: Include the directory when naming .h files
-
 #ifdef ENABLE_SECURITY
 namespace security_manager {
 class CryptoManager;
@@ -71,6 +60,16 @@ class SecurityManagerImpl;
 }  // namespace security_manager
 #endif  // ENABLE_SECURITY
 
+#include "utils/macro.h"
+#include "config_profile/profile.h"
+#include "hmi_message_handler/hmi_message_handler_impl.h"
+#include "application_manager/application_manager_impl.h"
+#include "connection_handler/connection_handler_impl.h"
+#include "protocol_handler/protocol_handler_impl.h"
+#include "transport_manager/transport_manager.h"
+#include "transport_manager/transport_manager_default.h"
+#include "media_manager/media_manager_impl.h"
+
 namespace main_namespace {
 class LifeCycle {
  public:
@@ -89,6 +88,7 @@ class LifeCycle {
   void StopComponents();
 
  private:
+  LifeCycle();
   transport_manager::TransportManagerImpl* transport_manager_;
   protocol_handler::ProtocolHandlerImpl* protocol_handler_;
   connection_handler::ConnectionHandlerImpl* connection_handler_;