Move RawMessagePtr to global namesapce

Update ProtocolHandler contants (move to enums and add information from
protcol documentation)
Review fix

71 files changed, 291 insertions, 284 deletions

diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h
index d1e0710fec..d3c1fabe75 100644
--- a/src/appMain/life_cycle.h
+++ b/src/appMain/life_cycle.h
@@ -90,7 +90,7 @@ class LifeCycle : public utils::Singleton<LifeCycle> {
     application_manager::ApplicationManagerImpl* app_manager_;
 #ifdef ENABLE_SECURITY
     security_manager::CryptoManager* crypto_manager_;
-    security_manager::SecurityManagerImpl* security_manager_;
+    security_manager::SecurityManager* security_manager_;
 #endif  // ENABLE_SECURITY
     hmi_message_handler::HMIMessageHandlerImpl* hmi_handler_;
     hmi_message_handler::HMIMessageAdapter* hmi_message_adapter_;
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index ac297866dd..a69c53073d 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -407,13 +407,13 @@ class ApplicationManagerImpl : public ApplicationManager,
      * @brief Overriden ProtocolObserver method
      */
     virtual void OnMessageReceived(
-        const protocol_handler::RawMessagePtr message);
+        const RawMessagePtr message);
 
     /*
      * @brief Overriden ProtocolObserver method
      */
     virtual void OnMobileMessageSent(
-        const protocol_handler::RawMessagePtr message);
+        const RawMessagePtr message);
 
     void OnMessageReceived(hmi_message_handler::MessageSharedPointer message);
     void OnErrorSending(hmi_message_handler::MessageSharedPointer message);
@@ -604,7 +604,7 @@ class ApplicationManagerImpl : public ApplicationManager,
     bool ConvertSOtoMessage(const smart_objects::SmartObject& message,
                             Message& output);
     utils::SharedPtr<Message> ConvertRawMsgToMessage(
-      const protocol_handler::RawMessagePtr message);
+      const RawMessagePtr message);
 
     void ProcessMessageFromMobile(const utils::SharedPtr<Message>& message);
     void ProcessMessageFromHMI(const utils::SharedPtr<Message>& message);
diff --git a/src/components/application_manager/include/application_manager/mobile_message_handler.h b/src/components/application_manager/include/application_manager/mobile_message_handler.h
index 0df1fa5943..c84ba54212 100644
--- a/src/components/application_manager/include/application_manager/mobile_message_handler.h
+++ b/src/components/application_manager/include/application_manager/mobile_message_handler.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_MESSAGE_HANDLER_IMPL_H_
 
 #include "utils/macro.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 #include "application_manager/message.h"
 
 namespace application_manager {
@@ -42,10 +42,10 @@ typedef utils::SharedPtr<application_manager::Message> MobileMessage;
 class MobileMessageHandler {
   public:
     static application_manager::Message* HandleIncomingMessageProtocolV1(
-      const protocol_handler::RawMessagePtr message);
+      const RawMessagePtr message);
 
     static application_manager::Message* HandleIncomingMessageProtocolV2(
-      const protocol_handler::RawMessagePtr message);
+      const RawMessagePtr message);
 
     //! -------------------------------------------------------------
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 330d5cbdd9..1b8da89c31 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -697,7 +697,7 @@ std::string ApplicationManagerImpl::GetDeviceName(
 }
 
 void ApplicationManagerImpl::OnMessageReceived(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnMessageReceived");
 
   if (!message) {
@@ -717,7 +717,7 @@ void ApplicationManagerImpl::OnMessageReceived(
 }
 
 void ApplicationManagerImpl::OnMobileMessageSent(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger_, "ApplicationManagerImpl::OnMobileMessageSent");
 }
 
@@ -1543,7 +1543,7 @@ bool ApplicationManagerImpl::ConvertSOtoMessage(
 }
 
 utils::SharedPtr<Message> ApplicationManagerImpl::ConvertRawMsgToMessage(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   DCHECK(message);
   utils::SharedPtr<Message> outgoing_message;
 
@@ -2110,7 +2110,7 @@ uint32_t ApplicationManagerImpl::GetAvailableSpaceForApp(
   app_storage_path += folder_name;
 
   if (file_system::DirectoryExists(app_storage_path)) {
-    uint32_t size_of_directory = file_system::DirectorySize(app_storage_path);
+    size_t size_of_directory = file_system::DirectorySize(app_storage_path);
     if (app_quota < size_of_directory) {
       return 0;
     }
diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc
index e19fc0adae..bddf5c8735 100644
--- a/src/components/application_manager/src/mobile_message_handler.cc
+++ b/src/components/application_manager/src/mobile_message_handler.cc
@@ -56,7 +56,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "MobileMessageHandler")
 
 application_manager::Message*
 MobileMessageHandler::HandleIncomingMessageProtocolV1(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger_,
                "MobileMessageHandler HandleIncomingMessageProtocolV1()");
   application_manager::Message* outgoing_message =
@@ -86,7 +86,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV1(
 
 application_manager::Message*
 MobileMessageHandler::HandleIncomingMessageProtocolV2(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger_,
                "MobileMessageHandler HandleIncomingMessageProtocolV2()");
 
diff --git a/src/components/include/protocol/common.h b/src/components/include/protocol/common.h
index 2c07de4493..63453c46a5 100644
--- a/src/components/include/protocol/common.h
+++ b/src/components/include/protocol/common.h
@@ -43,112 +43,147 @@
 namespace protocol_handler {
 
 /**
- *\brief Size of protocol header for first version of protocol.
+ *\brief Size of protocol header version 1.
  */
 const uint8_t PROTOCOL_HEADER_V1_SIZE = 8;
 
 /**
- *\brief Size of protocol header for second version of protocol.
+ *\brief Size of protocol header version 2 and higher.
  */
 const uint8_t PROTOCOL_HEADER_V2_SIZE = 12;
 
 /**
- *\brief Constant: number of protocol version (1).
- */
-const uint8_t PROTOCOL_VERSION_1 = 0x01;
-
-/**
- *\brief Constant: number of protocol version (2).
- */
-const uint8_t PROTOCOL_VERSION_2 = 0x02;
-
-/**
- *\brief Constant: number of protocol version (3).
- */
-const uint8_t PROTOCOL_VERSION_3 = 0x03;
-
-/**
- *\brief Constant: flag of protection
- */
-const bool PROTECTION_ON = true;
+ *\brief Protocol versions constants
+ * First 4-bit field of AppLink protocol packet
+ */
+enum {
+  /**
+   *\brief Constant: number of protocol version (1).
+   */
+  PROTOCOL_VERSION_1 = 0x01,
+  /**
+   *\brief Constant: number of protocol version (2).
+   * Has difference with v.1 in Mobile_API.xml and frame Header difference
+   * Support SSL with Encryption, Video and Audio services
+   */
+  PROTOCOL_VERSION_2 = 0x02,
+  /**
+   *\brief Constant: number of protocol version (3).
+   * Has no difference with v.2 in Mobile_API.xml and frame Header difference
+   * Support SSL with Encryption, Video and Audio services
+   * Suuport ControlFrame, End Service to/from mobile support, HeartBeat future
+   */
+  PROTOCOL_VERSION_3 = 0x03,
+  /**
+   *\brief Maximum value of packet version field (size 4-bit) specified AppLink Protocol v.7
+   */
+  PROTOCOL_VERSION_MAX = 0x0F
+};
 
 /**
- *\brief Constant: flag of no protection
+ *\brief Flag of protection packet
+ * 1-bit field of AppLink protocol packet
  */
+const bool PROTECTION_ON  = true;
 const bool PROTECTION_OFF = false;
 
 /**
- *\brief Constant: Control type of frame used in protocol header.
- */
-const uint8_t FRAME_TYPE_CONTROL = 0x00;
-
-/**
- *\brief Constant: Single type of frame used in protocol header.
- */
-const uint8_t FRAME_TYPE_SINGLE = 0x01;
-
-/**
- *\brief Constant: First frame for multiple frames used in protocol header.
- */
-const uint8_t FRAME_TYPE_FIRST = 0x02;
-
-/**
- *\brief Constant: Consecutive type of frame for multiple frames used in
- *\brief protocol header.
- */
-const uint8_t FRAME_TYPE_CONSECUTIVE = 0x03;
-
-/**
- *\brief Unused: If FRAME_TYPE_CONTROL: Constant: Frame is for heart beat.
- */
-const uint8_t FRAME_DATA_HEART_BEAT = 0x00;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: Start service frame
- */
-const uint8_t FRAME_DATA_START_SERVICE = 0x01;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: Start service acknowledgement frame
- */
-const uint8_t FRAME_DATA_START_SERVICE_ACK = 0x02;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: Start service not acknowledgement
- *\brief frame
- */
-const uint8_t FRAME_DATA_START_SERVICE_NACK = 0x03;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: End service request frame
- */
-const uint8_t FRAME_DATA_END_SERVICE = 0x04;
-
-/**
- * \brief if FRAME_TYPE_CONTROL: Constant: End service acknowledgement frame
- */
-const uint8_t FRAME_DATA_END_SERVICE_ACK = 0x05;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: End service not acknowledgement frame
- */
-const uint8_t FRAME_DATA_END_SERVICE_NACK = 0x06;
-
-/**
- *\brief If FRAME_TYPE_CONTROL: Constant: Service data ACK frame
- */
-const uint8_t FRAME_DATA_SERVICE_DATA_ACK = 0xFE;
-
-/**
- *\brief Unused: If FRAME_TYPE_CONTROL: Constant: Frame is for heart beat ack.
- */
-const uint8_t FRAME_DATA_HEART_BEAT_ACK = 0xFF;
+ *\brief Protocol frame type constants
+ * 3-bit field of AppLink protocol packet
+ */
+enum {
+  /**
+  *\brief Constant: Control type of frame
+  */
+  FRAME_TYPE_CONTROL = 0x00,
+  /**
+  *\brief Constant: Single type of frame.
+  */
+  FRAME_TYPE_SINGLE = 0x01,
+  /**
+  *\brief Constant: First frame for multiple frames
+  */
+  FRAME_TYPE_FIRST = 0x02,
+  /**
+  *\brief Constant: Consecutive type of frame for multiple frames
+  */
+  FRAME_TYPE_CONSECUTIVE = 0x03,
+  /**
+   *\brief Maximum value of frame type field (size 3-bit)
+   */
+  FRAME_TYPE_MAX_VALUE = 0x07
+};
 
 /**
- *\brief If FRAME_TYPE_CONTROL: Constant: Maximum of consecutive frame numbers
- * after which count has to roll over to 0x01
- */
-const uint8_t FRAME_DATA_MAX_VALUE = 0xFF;
+ *\brief Protocol frame info
+ * 8-bit field of AppLink protocol packet
+ */
+enum {
+  // Frame type FRAME_TYPE_CONTROL (0x0)
+  /**
+   *\brief Hartbeat frame type
+   */
+  FRAME_DATA_HEART_BEAT = 0x00,
+  /**
+   *\brief Start service frame
+   */
+  FRAME_DATA_START_SERVICE = 0x01,
+  /**
+   *\brief Start service acknowledgement frame
+   */
+  FRAME_DATA_START_SERVICE_ACK = 0x02,
+  /**
+   *\brief Start service not acknowledgement frame
+   */
+  FRAME_DATA_START_SERVICE_NACK = 0x03,
+  /**
+   *\brief End service request frame
+   */
+  FRAME_DATA_END_SERVICE = 0x04,
+  /**
+   * \brief End service acknowledgement frame
+   */
+  FRAME_DATA_END_SERVICE_ACK = 0x05,
+  /**
+   *\briefEnd service not acknowledgement frame
+   */
+  FRAME_DATA_END_SERVICE_NACK = 0x06,
+  /**
+   *\brief Service data ACK frame
+   */
+  FRAME_DATA_SERVICE_DATA_ACK = 0xFE,
+  /**
+   *\brief Frame is for heart beat ack
+   */
+  FRAME_DATA_HEART_BEAT_ACK = 0xFF,
+
+  // Frame type FRAME_TYPE_SINGLE (0x2)
+  /**
+   *\brief Single frame has reserver frame data value 0x0
+   */
+  FRAME_DATA_SINGLE = 0x00,
+
+  // Frame type FRAME_TYPE_FIRST (0x3)
+  /**
+   *\brief First frame has reserver frame data value 0x0
+   */
+  FRAME_DATA_FIRST = 0x00,
+
+  // Frame type FRAME_TYPE_CONSECUTIVE (0x3)
+  /**
+   *\brief Marks last frame in mutliframe message
+   */
+  FRAME_DATA_LAST_CONSECUTIVE = 0x00,
+  /**
+   *\brief Maximum of consecutive frame numbers after which count has to roll over to 0x01
+   */
+  FRAME_DATA_MAX_CONSECUTIVE = 0xFF,
+
+  /**
+   *\brief Maximum value of frame info field (size 8-bit)
+   */
+  FRAME_DATA_MAX_VALUE = 0xFF
+};
 
 /**
  *\brief If FRAME_TYPE_CONTROL: Constant: Maximum size of one frame excluding
@@ -157,12 +192,6 @@ const uint8_t FRAME_DATA_MAX_VALUE = 0xFF;
 const uint32_t MAXIMUM_FRAME_DATA_SIZE = 1500;
 
 /**
- *\brief If FRAME_TYPE_CONSECUTIVE: Constant: Marks last frame in mutliframe
- *\brief message.
- */
-const uint8_t FRAME_DATA_LAST_FRAME = 0x00;
-
-/**
  *\brief If FRAME_TYPE_CONSECUTIVE: Constant: Size of first frame in
  *\brief mutliframe message.
  */
@@ -192,4 +221,6 @@ enum RESULT_CODE {
   RESULT_UNKNOWN = 255
 };
 }  // namespace protocol_handler
+typedef ::protocol_handler::RawMessage    RawMessage;
+typedef ::protocol_handler::RawMessagePtr RawMessagePtr;
 #endif  // SRC_COMPONENTS_INCLUDE_PROTOCOL_COMMON_H_
diff --git a/src/components/include/protocol/message_priority.h b/src/components/include/protocol/message_priority.h
index 7cf7871e5e..baed0d89c4 100644
--- a/src/components/include/protocol/message_priority.h
+++ b/src/components/include/protocol/message_priority.h
@@ -54,7 +54,7 @@ class MessagePriority {
 
   // Ordering value which is used by queues to order messages
   // Higher value means higher prioirty
-  size_t OrderingValue();
+  size_t OrderingValue() const;
  private:
   // Constructor is private to prevent creation
   // of random priorities in the code please use static constructor if you
diff --git a/src/components/include/protocol_handler/protocol_handler.h b/src/components/include/protocol_handler/protocol_handler.h
index 6a8fb036b7..e0d4fde8cd 100644
--- a/src/components/include/protocol_handler/protocol_handler.h
+++ b/src/components/include/protocol_handler/protocol_handler.h
@@ -32,7 +32,7 @@
 #ifndef SRC_COMPONENTS_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_H_
 #define SRC_COMPONENTS_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_H_
 
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 /**
  *\namespace protocol_handlerHandler
diff --git a/src/components/include/protocol_handler/protocol_observer.h b/src/components/include/protocol_handler/protocol_observer.h
index 0bc922bfe1..3879a4057e 100644
--- a/src/components/include/protocol_handler/protocol_observer.h
+++ b/src/components/include/protocol_handler/protocol_observer.h
@@ -33,8 +33,7 @@
 #ifndef SRC_COMPONENTS_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_OBSERVER_H_
 #define SRC_COMPONENTS_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_OBSERVER_H_
 
-#include "protocol/raw_message.h"
-#include "utils/shared_ptr.h"
+#include "protocol/common.h"
 
 /**
  *\namespace protocol_handlerHandler
diff --git a/src/components/include/security_manager/security_manager.h b/src/components/include/security_manager/security_manager.h
index c3efbe879e..252ec610a8 100644
--- a/src/components/include/security_manager/security_manager.h
+++ b/src/components/include/security_manager/security_manager.h
@@ -97,7 +97,18 @@ class SecurityManager
   virtual void SendInternalError(const uint32_t connection_key,
                                  const uint8_t &error_id,
                                  const std::string &erorr_text,
-                                 const uint32_t seq_number = 0) = 0;
+                                 const uint32_t seq_number) = 0;
+  /**
+   * \brief Sends InternalError override methode for sending without seq_number
+   * \param connection_key Unique key used by other components as session identifier
+   * \param error_id  unique error identifier
+   * \param erorr_text SSL impelmentation error text
+   */
+  void SendInternalError(const uint32_t connection_key,
+                         const uint8_t &error_id,
+                         const std::string &erorr_text) {
+    SendInternalError(connection_key, error_id, erorr_text, 0);
+  }
 
   /**
    * \brief Create new SSLContext for connection or return exists
diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
index 7252033e39..82f39ad2a1 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
@@ -41,11 +41,12 @@
 #include <list>
 #include <map>
 
-#include "transport_manager/transport_adapter/device.h"
 #include "utils/shared_ptr.h"
+
+#include "transport_manager/transport_adapter/device.h"
 #include "transport_manager/common.h"
 #include "transport_manager/error.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 
@@ -53,8 +54,6 @@ class TMMetricObserver;
 
 namespace transport_adapter {
 
-using ::protocol_handler::RawMessagePtr;
-
 class TransportAdapterListener;
 
 // TODO(EZamakhov): cahnge to DeviceUID
diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h b/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h
index c11cd7d19f..d4c54ce0f7 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h
@@ -35,12 +35,10 @@
 
 #include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 
-using ::protocol_handler::RawMessagePtr;
-
 class TransportAdapterEvent {
  public:
   /**
@@ -98,14 +96,14 @@ class TransportAdapterEvent {
    *
    * @return Value that describe event type.
    */
-  virtual int event_type(void) const = 0;
+  virtual int event_type() const = 0;
 
   /**
    * @brief Return handle of application value.
    *
    * @return Handle of application.
    */
-  virtual ApplicationHandle application_id(void) const = 0;
+  virtual ApplicationHandle application_id() const = 0;
 
   /**
    * @brief Return smart pointer to the device adapter.
@@ -119,14 +117,14 @@ class TransportAdapterEvent {
    *
    * @return Smart pointer to the raw message.
    */
-  virtual RawMessagePtr data(void) const = 0;
+  virtual RawMessagePtr data() const = 0;
 
   /**
    * @brief Return pointer to the class that contain details of error.
    *
    * @return Pointer to the class that contain details of error.
    */
-  virtual BaseError *event_error(void) const = 0;
+  virtual BaseError *event_error() const = 0;
   /**
    * @brief Dectructor.
    */
diff --git a/src/components/include/transport_manager/transport_manager.h b/src/components/include/transport_manager/transport_manager.h
index 7ae3b2434b..108d5c320e 100644
--- a/src/components/include/transport_manager/transport_manager.h
+++ b/src/components/include/transport_manager/transport_manager.h
@@ -36,14 +36,12 @@
 #include "transport_manager/common.h"
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 
 class TransportAdapterEvent;
 
-using ::protocol_handler::RawMessagePtr;
-
 /**
  * @brief Interface of transport manager.
  **/
@@ -65,7 +63,7 @@ class TransportManager {
     *
     * @return Code error.
     **/
-  virtual int SearchDevices(void) = 0;
+  virtual int SearchDevices() = 0;
 
   /**
    * @brief Connect to all applications discovered on device.
diff --git a/src/components/include/transport_manager/transport_manager_listener.h b/src/components/include/transport_manager/transport_manager_listener.h
index 94b11b8205..c36c0cb2f1 100644
--- a/src/components/include/transport_manager/transport_manager_listener.h
+++ b/src/components/include/transport_manager/transport_manager_listener.h
@@ -37,12 +37,10 @@
 #include "transport_manager/common.h"
 #include "transport_manager/info.h"
 #include "transport_manager/error.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 
-using ::protocol_handler::RawMessagePtr;
-
 class TransportManagerListener {
  public:
   /**
diff --git a/src/components/include/transport_manager/transport_manager_listener_empty.h b/src/components/include/transport_manager/transport_manager_listener_empty.h
index 8cf263d412..2b3149bb54 100644
--- a/src/components/include/transport_manager/transport_manager_listener_empty.h
+++ b/src/components/include/transport_manager/transport_manager_listener_empty.h
@@ -36,6 +36,7 @@
 #include <vector>
 
 #include "transport_manager/transport_manager_listener.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 
diff --git a/src/components/include/utils/message_queue.h b/src/components/include/utils/message_queue.h
index 352ac393d0..d36262db11 100644
--- a/src/components/include/utils/message_queue.h
+++ b/src/components/include/utils/message_queue.h
@@ -62,7 +62,7 @@ template<typename T, class Q = std::queue<T> > class MessageQueue {
      * \brief Returns size of the queue.
      * \return Size of the queue.
      */
-    int32_t size() const;
+    size_t size() const;
 
     /**
      * \brief If queue is empty.
@@ -139,7 +139,7 @@ template<typename T, class Q> void MessageQueue<T, Q>::wait() {
   }
 }
 
-template<typename T, class Q> int32_t MessageQueue<T, Q>::size() const {
+template<typename T, class Q> size_t MessageQueue<T, Q>::size() const {
   sync_primitives::AutoLock auto_lock(queue_lock_);
   return queue_.size();
 }
diff --git a/src/components/include/utils/shared_ptr.h b/src/components/include/utils/shared_ptr.h
index edbada3cb8..f97c2b42f1 100644
--- a/src/components/include/utils/shared_ptr.h
+++ b/src/components/include/utils/shared_ptr.h
@@ -103,7 +103,7 @@ class SharedPtr {
      * Decrement reference counter and destroy wrapped object
      * if reference counter reaches zero.
      **/
-    ~SharedPtr(void);
+    ~SharedPtr();
 
     /**
      * @brief Assignment operator.
@@ -154,7 +154,7 @@ class SharedPtr {
      *
      * @return Wrapped object.
      **/
-    ObjectType* operator->(void) const;
+    ObjectType* operator->() const;
 
     ObjectType& operator*() const;
     operator bool() const;
@@ -181,7 +181,7 @@ class SharedPtr {
      * If reference counter reaches zero object and its reference
      * counter will be deallocated.
      **/
-    void dropReference(void);
+    void dropReference();
 
     /**
      * @brief Wrapped object.
@@ -226,7 +226,7 @@ inline utils::SharedPtr<ObjectType>::SharedPtr(
 }
 
 template<typename ObjectType>
-inline utils::SharedPtr<ObjectType>::~SharedPtr(void) {
+inline utils::SharedPtr<ObjectType>::~SharedPtr() {
   dropReference();
 }
 
@@ -280,7 +280,7 @@ utils::SharedPtr<OtherObjectType> utils::SharedPtr<ObjectType>::static_pointer_c
 }
 
 template<typename ObjectType> ObjectType*
-utils::SharedPtr<ObjectType>::operator->(void) const {
+utils::SharedPtr<ObjectType>::operator->() const {
   DCHECK(mObject);
   return mObject;
 }
@@ -315,7 +315,7 @@ utils::SharedPtr<ObjectType>::reset_impl(ObjectType* other) {
 }
 
 template<typename ObjectType>
-inline void SharedPtr<ObjectType>::dropReference(void) {
+inline void SharedPtr<ObjectType>::dropReference() {
   if (0 != mReferenceCounter) {
     if (1 == atomic_post_dec(mReferenceCounter)) {
 
diff --git a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
index ebb7f66af6..9eb63c2fe8 100644
--- a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_A2DP_SOURCE_PLAYER_ADAPTER_H_
 
 #include <map>
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 #include "media_manager/media_adapter_impl.h"
 
 namespace threads {
@@ -48,7 +48,7 @@ class A2DPSourcePlayerAdapter : public MediaAdapterImpl {
     A2DPSourcePlayerAdapter();
     ~A2DPSourcePlayerAdapter();
     void SendData(int32_t application_key,
-                  const protocol_handler::RawMessagePtr message) {}
+                  const RawMessagePtr message) {}
     void StartActivity(int32_t application_key);
     void StopActivity(int32_t application_key);
     bool is_app_performing_activity(int32_t application_key);
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
index ddf1abef21..d7d0434a49 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
@@ -47,7 +47,7 @@ class FromMicRecorderAdapter : public MediaAdapterImpl {
     FromMicRecorderAdapter();
     ~FromMicRecorderAdapter();
     void SendData(int32_t application_key,
-                  const protocol_handler::RawMessagePtr message) {}
+                  const RawMessagePtr message) {}
     void StartActivity(int32_t application_key);
     void StopActivity(int32_t application_key);
     bool is_app_performing_activity(int32_t application_key);
diff --git a/src/components/media_manager/include/media_manager/media_adapter.h b/src/components/media_manager/include/media_manager/media_adapter.h
index b3f3e02143..66f23df6bc 100644
--- a/src/components/media_manager/include/media_manager/media_adapter.h
+++ b/src/components/media_manager/include/media_manager/media_adapter.h
@@ -34,14 +34,14 @@
 #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_H_
 
 #include <cstdint>
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace media_manager {
 
 class MediaAdapter {
  public:
   virtual void SendData(int32_t application_key,
-                        const protocol_handler::RawMessagePtr message) = 0;
+                        const RawMessagePtr message) = 0;
   virtual void StartActivity(int32_t application_key) = 0;
   virtual void StopActivity(int32_t application_key) = 0;
   virtual bool is_app_performing_activity(int32_t application_key) = 0;
diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h
index 876bca857f..7f997bf8c3 100644
--- a/src/components/media_manager/include/media_manager/media_manager_impl.h
+++ b/src/components/media_manager/include/media_manager/media_manager_impl.h
@@ -62,9 +62,9 @@ class MediaManagerImpl : public MediaManager,
     virtual void StartAudioStreaming(int32_t application_key);
     virtual void StopAudioStreaming(int32_t application_key);
     virtual void OnMessageReceived(
-      const protocol_handler::RawMessagePtr message);
+      const RawMessagePtr message);
     virtual void OnMobileMessageSent(
-      const protocol_handler::RawMessagePtr message);
+      const RawMessagePtr message);
     virtual void FramesProcessed(int32_t application_key, int32_t frame_number);
 
   protected:
diff --git a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
index f26a2f95ef..9a33dd4744 100644
--- a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h
@@ -46,7 +46,7 @@ class PipeStreamerAdapter : public MediaAdapterImpl {
     PipeStreamerAdapter();
     virtual ~PipeStreamerAdapter();
     virtual void SendData(int32_t application_key,
-                          const protocol_handler::RawMessagePtr message);
+                          const RawMessagePtr message);
     virtual void StartActivity(int32_t application_key);
     virtual void StopActivity(int32_t application_key);
     virtual bool is_app_performing_activity(int32_t application_key);
@@ -104,7 +104,7 @@ class PipeStreamerAdapter : public MediaAdapterImpl {
 
     bool                                          is_ready_;
     threads::Thread*                              thread_;
-    MessageQueue<protocol_handler::RawMessagePtr> messages_;
+    MessageQueue<RawMessagePtr> messages_;
 
     DISALLOW_COPY_AND_ASSIGN(PipeStreamerAdapter);
 };
diff --git a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
index 4bc7b30a26..57fb51ed56 100644
--- a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h
@@ -47,7 +47,7 @@ class SocketStreamerAdapter : public MediaAdapterImpl {
     SocketStreamerAdapter();
     virtual ~SocketStreamerAdapter();
     virtual void SendData(int32_t application_key,
-                          const protocol_handler::RawMessagePtr message);
+                          const RawMessagePtr message);
     virtual void StartActivity(int32_t application_key);
     virtual void StopActivity(int32_t application_key);
     virtual bool is_app_performing_activity(int32_t application_key);
@@ -111,7 +111,7 @@ class SocketStreamerAdapter : public MediaAdapterImpl {
          *
          * @param block Pointer to the data
          */
-        bool send(const protocol_handler::RawMessagePtr msg);
+        bool send(const RawMessagePtr msg);
 
       private:
         SocketStreamerAdapter* const server_;
@@ -127,7 +127,7 @@ class SocketStreamerAdapter : public MediaAdapterImpl {
     bool                                          is_ready_;
     threads::Thread*                              thread_;
     Streamer*                                     streamer_;
-    MessageQueue<protocol_handler::RawMessagePtr> messages_;
+    MessageQueue<RawMessagePtr> messages_;
 
     DISALLOW_COPY_AND_ASSIGN(SocketStreamerAdapter);
 };
diff --git a/src/components/media_manager/include/media_manager/video/video_stream_to_file_adapter.h b/src/components/media_manager/include/media_manager/video/video_stream_to_file_adapter.h
index 5721781609..819c4f5edb 100644
--- a/src/components/media_manager/include/media_manager/video/video_stream_to_file_adapter.h
+++ b/src/components/media_manager/include/media_manager/video/video_stream_to_file_adapter.h
@@ -47,7 +47,7 @@ class VideoStreamToFileAdapter : public MediaAdapterImpl {
     explicit VideoStreamToFileAdapter(const std::string& file_name);
     virtual ~VideoStreamToFileAdapter();
     virtual void SendData(int32_t application_key,
-                          const protocol_handler::RawMessagePtr message);
+                          const RawMessagePtr message);
     virtual void StartActivity(int32_t application_key);
     virtual void StopActivity(int32_t application_key);
     virtual bool is_app_performing_activity(int32_t application_key);
@@ -104,7 +104,7 @@ class VideoStreamToFileAdapter : public MediaAdapterImpl {
     std::string                                   file_name_;
     bool                                          is_ready_;
     threads::Thread*                              thread_;
-    MessageQueue<protocol_handler::RawMessagePtr> messages_;
+    MessageQueue<RawMessagePtr> messages_;
 };
 }  //  namespace media_manager
 
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc
index f9feed0db2..8189a27e01 100644
--- a/src/components/media_manager/src/media_manager_impl.cc
+++ b/src/components/media_manager/src/media_manager_impl.cc
@@ -292,7 +292,7 @@ void MediaManagerImpl::StopAudioStreaming(int32_t application_key) {
 
 
 void MediaManagerImpl::OnMessageReceived(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   if (message->service_type()
       == protocol_handler::kMobileNav) {
     if (!(application_manager::ApplicationManagerImpl::instance()->
@@ -315,7 +315,7 @@ void MediaManagerImpl::OnMessageReceived(
 }
 
 void MediaManagerImpl::OnMobileMessageSent(
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
 }
 
 void MediaManagerImpl::FramesProcessed(int32_t application_key,
diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc
index 7088135020..ace98ba13e 100644
--- a/src/components/media_manager/src/pipe_streamer_adapter.cc
+++ b/src/components/media_manager/src/pipe_streamer_adapter.cc
@@ -63,7 +63,7 @@ PipeStreamerAdapter::~PipeStreamerAdapter() {
 
 void PipeStreamerAdapter::SendData(
   int32_t application_key,
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger, "PipeStreamerAdapter::SendData");
 
   if (application_key != current_application_) {
@@ -146,7 +146,7 @@ void PipeStreamerAdapter::Streamer::threadMain() {
 
   while (!stop_flag_) {
     while (!server_->messages_.empty()) {
-      protocol_handler::RawMessagePtr msg = server_->messages_.pop();
+      RawMessagePtr msg = server_->messages_.pop();
       if (!msg) {
         LOG4CXX_ERROR(logger, "Null pointer message");
         continue;
diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc
index dd4bc85db6..c0b47812c7 100644
--- a/src/components/media_manager/src/socket_streamer_adapter.cc
+++ b/src/components/media_manager/src/socket_streamer_adapter.cc
@@ -125,7 +125,7 @@ void SocketStreamerAdapter::Init() {
 
 void SocketStreamerAdapter::SendData(
   int32_t application_key,
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger, "SocketStreamerAdapter::sendData");
 
 
@@ -171,7 +171,7 @@ void SocketStreamerAdapter::Streamer::threadMain() {
     is_first_loop_ = true;
     while (is_client_connected_) {
       while (!server_->messages_.empty()) {
-        protocol_handler::RawMessagePtr msg = server_->messages_.pop();
+        RawMessagePtr msg = server_->messages_.pop();
         if (!msg) {
           LOG4CXX_ERROR(logger, "Null pointer message");
           continue;
@@ -290,7 +290,7 @@ bool SocketStreamerAdapter::Streamer::is_ready() const {
 }
 
 bool SocketStreamerAdapter::Streamer::send(
-  const protocol_handler::RawMessagePtr msg) {
+  const RawMessagePtr msg) {
   if (!is_ready()) {
     LOG4CXX_ERROR_EXT(logger, " Socket is not ready");
     return false;
diff --git a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
index 6bd98efdb4..d37e175ac1 100644
--- a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
+++ b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
@@ -67,7 +67,7 @@ void VideoStreamToFileAdapter::Init() {
 
 void VideoStreamToFileAdapter::SendData(
   int32_t application_key,
-  const protocol_handler::RawMessagePtr message) {
+  const RawMessagePtr message) {
   LOG4CXX_INFO(logger, "VideoStreamToFileAdapter::SendData "
                << application_key);
 
@@ -143,7 +143,7 @@ void VideoStreamToFileAdapter::Streamer::threadMain() {
 
   while (!stop_flag_) {
     while (!server_->messages_.empty()) {
-      protocol_handler::RawMessagePtr msg = server_->messages_.pop();
+      RawMessagePtr msg = server_->messages_.pop();
       if (!msg) {
         LOG4CXX_ERROR(logger, "Null pointer message");
         continue;
diff --git a/src/components/protocol/src/message_priority.cc b/src/components/protocol/src/message_priority.cc
index 0ca607d8c2..d76cde038c 100644
--- a/src/components/protocol/src/message_priority.cc
+++ b/src/components/protocol/src/message_priority.cc
@@ -53,7 +53,7 @@ MessagePriority::MessagePriority(const MessagePriority& that)
   : value_(that.value_) {
 }
 
-size_t MessagePriority::OrderingValue() {
+size_t MessagePriority::OrderingValue() const {
   return value_;
 }
 }  // namespace protocol_handler
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
index 58c0c6dd14..a0f73b4cee 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_PACKET_H_
 
 #include "utils/macro.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 #include "protocol/common.h"
 
 /**
@@ -155,7 +155,7 @@ class ProtocolPacket {
    * \brief Serializes info about message into protocol header.
    * \return RawMessagePtr with all data (header and message)
    */
-  protocol_handler::RawMessagePtr serializePacket() const;
+  RawMessagePtr serializePacket() const;
   /**
    * \brief Appends message frame to existing message in
    * recieving multiframe messages.
@@ -169,7 +169,7 @@ class ProtocolPacket {
    * \brief Getter of message size including protocol header
    * \return uint32_t size of message string
    */
-  uint32_t packet_size() const;
+  size_t packet_size() const;
 
   /**
    * \brief Getter of message ID
diff --git a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h b/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h
index 1b480cdc78..1d3d83ea48 100644
--- a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h
+++ b/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h
@@ -32,7 +32,7 @@
 
 #ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_
 #define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 #include <stdint.h>
 #include "utils/date_time.h"
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 314a97ef06..2c4182b08e 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -593,7 +593,7 @@ RESULT_CODE ProtocolHandlerImpl::SendSingleFrameMessage(
   LOG4CXX_TRACE_ENTER(logger_);
 
   ProtocolFramePtr ptr(new protocol_handler::ProtocolPacket(connection_id,
-      protocol_version, PROTECTION_OFF, FRAME_TYPE_SINGLE, service_type, 0,
+      protocol_version, PROTECTION_OFF, FRAME_TYPE_SINGLE, service_type, FRAME_DATA_SINGLE,
       session_id, data_size, message_counters_[session_id]++, data));
 
   raw_ford_messages_to_mobile_.PostMessage(
@@ -645,7 +645,8 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage(
   const ProtocolFramePtr firstPacket(
         new protocol_handler::ProtocolPacket(
           connection_id, protocol_version, PROTECTION_OFF, FRAME_TYPE_FIRST,
-          service_type, 0, session_id, FIRST_FRAME_DATA_SIZE, message_id, out_data));
+          service_type, FRAME_DATA_FIRST, session_id, FIRST_FRAME_DATA_SIZE,
+          message_id, out_data));
 
   raw_ford_messages_to_mobile_.PostMessage(
       impl::RawFordMessageToMobile(firstPacket, false));
@@ -654,7 +655,10 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage(
   for (uint32_t i = 0; i < frames_count; ++i) {
     const bool is_last_frame = (i == (frames_count - 1));
     const size_t frame_size = is_last_frame ? lastframe_size : maxdata_size;
-    const uint8_t data_type = is_last_frame ? 0 : (i % FRAME_DATA_MAX_VALUE + 1);
+    const uint8_t data_type =
+        is_last_frame
+        ? FRAME_DATA_LAST_CONSECUTIVE
+        : (i % FRAME_DATA_MAX_CONSECUTIVE + 1);
     const bool is_final_packet = is_last_frame ? is_final_message : false;
 
     const ProtocolFramePtr ptr(new protocol_handler::ProtocolPacket(connection_id,
@@ -781,7 +785,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleMultiFrameMessage(
       return RESULT_FAIL;
     }
 
-    if (packet->frame_data() == FRAME_DATA_LAST_FRAME) {
+    if (packet->frame_data() == FRAME_DATA_LAST_CONSECUTIVE) {
       LOG4CXX_INFO(
           logger_,
           "Last frame of multiframe message size " << packet->data_size()
diff --git a/src/components/protocol_handler/src/protocol_packet.cc b/src/components/protocol_handler/src/protocol_packet.cc
index be9b6963f2..5ff890d41b 100644
--- a/src/components/protocol_handler/src/protocol_packet.cc
+++ b/src/components/protocol_handler/src/protocol_packet.cc
@@ -143,6 +143,10 @@ RESULT_CODE ProtocolPacket::appendData(uint8_t *chunkData,
   return RESULT_FAIL;
 }
 
+size_t ProtocolPacket::packet_size() const {
+  return packet_header_.dataSize;
+}
+
 RESULT_CODE ProtocolPacket::deserializePacket(const uint8_t *message,
                                               uint32_t messageSize) {
   uint8_t offset = 0;
diff --git a/src/components/security_manager/include/security_manager/security_manager_impl.h b/src/components/security_manager/include/security_manager/security_manager_impl.h
index 9c6f9b561d..1158675309 100644
--- a/src/components/security_manager/include/security_manager/security_manager_impl.h
+++ b/src/components/security_manager/include/security_manager/security_manager_impl.h
@@ -37,13 +37,13 @@
 #include <string>
 
 #include "utils/macro.h"
+#include "utils/message_queue.h"
+#include "utils/threads/message_loop_thread.h"
 
 #include "security_manager/security_manager.h"
 #include "security_manager/security_query.h"
 #include "protocol_handler/protocol_handler.h"
-#include "protocol/raw_message.h"
-#include "utils/message_queue.h"
-#include "utils/threads/message_loop_thread.h"
+#include "protocol/common.h"
 
 namespace security_manager {
 /**
@@ -62,8 +62,6 @@ struct SecurityMessage: public SecurityQueryPtr {
 typedef utils::PrioritizedQueue<SecurityMessage> SecurityMessageQueue;
 typedef threads::MessageLoopThread<SecurityMessageQueue> SecurityMessageLoop;
 
-using protocol_handler::RawMessagePtr;
-
 /**
  * \brief SecurityManagerImpl class implements SecurityManager inteface
  */
@@ -115,7 +113,9 @@ class SecurityManagerImpl
   void SendInternalError(const uint32_t connection_key,
                          const uint8_t &error_id,
                          const std::string &erorr_text,
-                         const uint32_t seq_number = 0) OVERRIDE;
+                         const uint32_t seq_number) OVERRIDE;
+
+  using SecurityManager::SendInternalError;
 
   /**
    * \brief Handle SecurityMessage from mobile for processing
diff --git a/src/components/security_manager/src/security_manager_impl.cc b/src/components/security_manager/src/security_manager_impl.cc
index 583dd188ea..0bfa686de8 100644
--- a/src/components/security_manager/src/security_manager_impl.cc
+++ b/src/components/security_manager/src/security_manager_impl.cc
@@ -73,7 +73,7 @@ void SecurityManagerImpl::OnMessageReceived(
 }
 
 void SecurityManagerImpl::OnMobileMessageSent(
-    const protocol_handler::RawMessagePtr ) {
+    const RawMessagePtr ) {
 }
 
 void SecurityManagerImpl::set_session_observer(
@@ -349,7 +349,7 @@ void SecurityManagerImpl::SendQuery(const SecurityQuery& query,
                                 const uint32_t connection_key) {
   const std::vector<uint8_t> data_sending = query.DeserializeQuery();
 
-  const protocol_handler::RawMessagePtr rawMessagePtr(
+  const RawMessagePtr rawMessagePtr(
         new protocol_handler::RawMessage(connection_key,
                                          protocol_handler::PROTOCOL_VERSION_3,
                                          &data_sending[0], data_sending.size(),
diff --git a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
index a4bfb50600..327df8dd9e 100644
--- a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
@@ -64,7 +64,7 @@ class CAlwaysFalseSchemaItem : public ISchemaItem {
   /**
    * @brief Constructor.
    **/
-  CAlwaysFalseSchemaItem(void);
+  CAlwaysFalseSchemaItem();
 
   /**
    * @brief Copy constructor.
diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h
index 5e9ba74936..aca3747fc1 100644
--- a/src/components/smart_objects/include/smart_objects/number_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h
@@ -189,7 +189,7 @@ SmartType TNumberSchemaItem<uint32_t>::getSmartType();
  * @return SmartType_Double.
  **/
 template<>
-SmartType TNumberSchemaItem<double>::getSmartType(void);
+SmartType TNumberSchemaItem<double>::getSmartType();
 
 template<typename NumberType>
 utils::SharedPtr<TNumberSchemaItem<NumberType> >
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index 183e481c5b..b465e8fe90 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -54,7 +54,7 @@ class CObjectSchemaItem : public ISchemaItem {
     /**
      * @brief Default constructor.
      **/
-    SMember(void);
+    SMember();
 
     /**
      * @brief Constructor.
diff --git a/src/components/smart_objects/include/smart_objects/schema_item_parameter.h b/src/components/smart_objects/include/smart_objects/schema_item_parameter.h
index d918ce227b..dd9d9af2d7 100644
--- a/src/components/smart_objects/include/smart_objects/schema_item_parameter.h
+++ b/src/components/smart_objects/include/smart_objects/schema_item_parameter.h
@@ -87,7 +87,7 @@ class TSchemaItemParameter {
 };
 
 template<typename ParameterType>
-TSchemaItemParameter<ParameterType>::TSchemaItemParameter(void)
+TSchemaItemParameter<ParameterType>::TSchemaItemParameter()
     : mIsSpecified(false),
       mValue() {
 }
diff --git a/src/components/smart_objects/include/smart_objects/smart_object.h b/src/components/smart_objects/include/smart_objects/smart_object.h
index bd48fd8c20..3fad8c06fa 100644
--- a/src/components/smart_objects/include/smart_objects/smart_object.h
+++ b/src/components/smart_objects/include/smart_objects/smart_object.h
@@ -404,7 +404,7 @@ class SmartObject {
    * @return std::string Value of the object converted to bool type or invalid_string_value if
    *         conversion is not possible
    **/
-  // operator std::string(void) const;
+  // operator std::string() const;
   /**
    * @brief Returns current object converted to string
    *
@@ -470,7 +470,7 @@ class SmartObject {
    * @return SmartBinary Value of the object converted to binary type or invalid_binary_value if
    *         conversion is not possible
    **/
-  // operator SmartBinary(void) const;
+  // operator SmartBinary() const;
   /**
    * @brief Returns current object converted to binary
    *
diff --git a/src/components/smart_objects/src/always_false_schema_item.cc b/src/components/smart_objects/src/always_false_schema_item.cc
index 95209b7c7f..96f4e67729 100644
--- a/src/components/smart_objects/src/always_false_schema_item.cc
+++ b/src/components/smart_objects/src/always_false_schema_item.cc
@@ -33,10 +33,10 @@
 namespace NsSmartDeviceLink {
 namespace NsSmartObjects {
 
-CAlwaysFalseSchemaItem::CAlwaysFalseSchemaItem(void) {
+CAlwaysFalseSchemaItem::CAlwaysFalseSchemaItem() {
 }
 
-utils::SharedPtr<CAlwaysFalseSchemaItem> CAlwaysFalseSchemaItem::create(void) {
+utils::SharedPtr<CAlwaysFalseSchemaItem> CAlwaysFalseSchemaItem::create() {
   return new CAlwaysFalseSchemaItem();
 }
 
diff --git a/src/components/smart_objects/src/always_true_schema_item.cc b/src/components/smart_objects/src/always_true_schema_item.cc
index 8f486a15f6..8f77919443 100644
--- a/src/components/smart_objects/src/always_true_schema_item.cc
+++ b/src/components/smart_objects/src/always_true_schema_item.cc
@@ -33,10 +33,10 @@
 namespace NsSmartDeviceLink {
 namespace NsSmartObjects {
 
-CAlwaysTrueSchemaItem::CAlwaysTrueSchemaItem(void) {
+CAlwaysTrueSchemaItem::CAlwaysTrueSchemaItem() {
 }
 
-utils::SharedPtr<CAlwaysTrueSchemaItem> CAlwaysTrueSchemaItem::create(void) {
+utils::SharedPtr<CAlwaysTrueSchemaItem> CAlwaysTrueSchemaItem::create() {
   return new CAlwaysTrueSchemaItem();
 }
 
diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc
index 21ddf7dd5e..aa4a1f0fc2 100644
--- a/src/components/smart_objects/src/smart_object.cc
+++ b/src/components/smart_objects/src/smart_object.cc
@@ -335,7 +335,7 @@ void SmartObject::set_value_double(double NewValue) {
   m_data.double_value = NewValue;
 }
 
-double SmartObject::convert_double(void) const {
+double SmartObject::convert_double() const {
   double retval;
 
   switch (m_type) {
@@ -531,7 +531,7 @@ void SmartObject::set_value_string(const std::string& NewValue) {
   m_data.str_value = new std::string(NewValue);
 }
 
-std::string SmartObject::convert_string(void) const {
+std::string SmartObject::convert_string() const {
   std::string retval;
   std::stringstream stream;
 
@@ -647,7 +647,7 @@ void SmartObject::set_value_binary(SmartBinary NewValue) {
   m_data.binary_value = new SmartBinary(NewValue);
 }
 
-SmartBinary SmartObject::convert_binary(void) const {
+SmartBinary SmartObject::convert_binary() const {
   switch (m_type) {
     case SmartType_Binary:
       return *(m_data.binary_value);
diff --git a/src/components/transport_manager/include/transport_manager/pasa_bt/bluetooth_PASA_connection.h b/src/components/transport_manager/include/transport_manager/pasa_bt/bluetooth_PASA_connection.h
index 7f0f6890db..47f7ad83d0 100644
--- a/src/components/transport_manager/include/transport_manager/pasa_bt/bluetooth_PASA_connection.h
+++ b/src/components/transport_manager/include/transport_manager/pasa_bt/bluetooth_PASA_connection.h
@@ -30,20 +30,19 @@
  * POSSIBILITY OF SUCH DAMAGE.

  */

 

-#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_BLUETOOTH_BLUETOOTH_SOCKET_CONNECTION_H_

-#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_BLUETOOTH_BLUETOOTH_SOCKET_CONNECTION_H_

+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_PASA_BT_BLUETOOTH_PASA_CONNECTION_H_

+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_PASA_BT_BLUETOOTH_PASA_CONNECTION_H_

 

 #include <poll.h>

+#include <mqueue.h>

 

 #include <queue>

-#include <mqueue.h>

+#include <string>

 

 #include "transport_manager/transport_adapter/connection.h"

 #include "utils/logger.h"

 #include "utils/lock.h"

 

-using ::transport_manager::transport_adapter::Connection;

-

 namespace transport_manager {

 namespace transport_adapter {

 

@@ -52,7 +51,8 @@ class TransportAdapterController;
 /**

  * @brief Class responsible for communication over bluetooth sockets.

  */

-class BluetoothPASAConnection : public Connection {

+class BluetoothPASAConnection

+    : public ::transport_manager::transport_adapter::Connection {

  public:

   /**

    * @brief Constructor.

@@ -91,6 +91,7 @@ class BluetoothPASAConnection : public Connection {
    * @brief Destructor.

    */

   virtual ~BluetoothPASAConnection();

+

  protected:

   /**

    * @brief Establish connection.

@@ -150,5 +151,4 @@ class BluetoothPASAConnection : public Connection {
 };

 }  // namespace transport_adapter

 }  // namespace transport_manager

-

-#endif /* BLUETOOTH_SOCKET_CONNECTION_H_ */

+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_PASA_BT_BLUETOOTH_PASA_CONNECTION_H_

diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
index 789c796e39..2bfea9c818 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
@@ -38,8 +38,6 @@
 #include "utils/shared_ptr.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
 
-using utils::SharedPtr;
-
 namespace transport_manager {
 
 namespace transport_adapter {
@@ -80,5 +78,4 @@ typedef utils::SharedPtr<Connection> ConnectionSptr;
 
 }  // namespace transport_adapter
 }  // namespace transport_manager
-
-#endif /* CONNECTION_H_ */
+#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_CONNECTION_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
index 8e80a3d2b2..c4dd3cb5cc 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
@@ -36,10 +36,10 @@
 #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_THREADED_SOCKET_CONNECTION_H_
 
 #include <poll.h>
-
 #include <queue>
 
 #include "transport_manager/transport_adapter/connection.h"
+#include "protocol/common.h"
 
 using ::transport_manager::transport_adapter::Connection;
 
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
index a727d13b40..d85caab1c0 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
@@ -35,15 +35,13 @@
 
 #include "transport_manager/transport_adapter/device.h"
 #include "transport_manager/transport_adapter/connection.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
-
 namespace transport_adapter {
 
-
 class TransportAdapterController {
  public:
-
   virtual ~TransportAdapterController() {
   }
 
@@ -212,5 +210,4 @@ class TransportAdapterController {
 
 }  // namespace transport_adapter
 }  // namespace transport_manager
-
-#endif /* transport_adapter_CONTROLLER_H_ */
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_CONTROLLER_H_
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_event_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_event_impl.h
index e7af98418b..30c7129c32 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_event_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_event_impl.h
@@ -37,8 +37,6 @@
 
 namespace transport_manager {
 
-using ::protocol_handler::RawMessagePtr;
-
 class TransportAdapterEventImpl : public TransportAdapterEvent {
  public:
   /**
@@ -112,14 +110,14 @@ class TransportAdapterEventImpl : public TransportAdapterEvent {
    *
    * @return Value that describe event type.
    */
-  int event_type(void) const;
+  int event_type() const;
 
   /**
    * @brief Return handle of application value.
    *
    * @return Handle of application.
    */
-  ApplicationHandle application_id(void) const;
+  ApplicationHandle application_id() const;
 
   /**
    * @brief Return smart pointer to the device adapter.
@@ -133,14 +131,14 @@ class TransportAdapterEventImpl : public TransportAdapterEvent {
    *
    * @return Smart pointer to the raw message.
    */
-  RawMessagePtr data(void) const;
+  RawMessagePtr data() const;
 
   /**
    * @brief Return pointer to the class that contain details of error.
    *
    * @return Pointer to the class that contain details of error.
    */
-  BaseError *event_error(void) const;
+  BaseError *event_error() const;
 
  private:
   int event_type_;                   /**< Value that describe event type. */
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
index 25017efa6b..1adfa0ad2e 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h
@@ -35,13 +35,11 @@
 
 #include "transport_manager/common.h"
 #include "transport_manager/error.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 namespace transport_manager {
 namespace transport_adapter {
 
-using ::protocol_handler::RawMessagePtr;
-
 class TransportAdapter;
 
 /**
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
index 4a4cb4ed98..212e61e96c 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h
@@ -36,12 +36,10 @@
 #include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
-#include "protocol/raw_message.h"
 
 namespace transport_manager {
 
 using transport_manager::transport_adapter::TransportAdapter;
-using ::protocol_handler::RawMessagePtr;
 
 class TransportManagerImpl;
 
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index 3841ac89be..738fe7969f 100755
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -48,21 +48,20 @@
 #include <algorithm>
 
 #include "utils/timer_thread.h"
+#include "utils/rwlock.h"
+
 #include "transport_manager/transport_manager.h"
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener_impl.h"
-#include "protocol/raw_message.h"
-#include "utils/rwlock.h"
+#include "protocol/common.h"
 #ifdef TIME_TESTER
 #include "transport_manager/time_metric_observer.h"
 #endif  // TIME_TESTER
 
-using ::transport_manager::transport_adapter::TransportAdapterListener;
-
 namespace transport_manager {
 
 /**
- * @brief Implementation of transport manager.
+ * @brief Implementation of transport manager.s
  */
 class TransportManagerImpl : public TransportManager {
  public:
@@ -101,7 +100,7 @@ class TransportManagerImpl : public TransportManager {
   /**
    * @brief Destructor.
    **/
-  virtual ~TransportManagerImpl(void);
+  virtual ~TransportManagerImpl();
 
   /**
    * @brief Initialize transport manager.
@@ -115,7 +114,7 @@ class TransportManagerImpl : public TransportManager {
    *
    * @return Code error.
    **/
-  virtual int SearchDevices(void);
+  virtual int SearchDevices();
 
   /**
    * @brief Connect to all applications discovered on device.
@@ -293,10 +292,10 @@ class TransportManagerImpl : public TransportManager {
    *
    * @see @ref components_transportmanager_client_connection_management
    */
-  void MessageQueueThread(void);
+  void MessageQueueThread();
 
   /**
-   * @brief Launch EventListenerThread(void).
+   * @brief Launch EventListenerThread().
    */
   static void* EventListenerStartThread(void*);
   /**
@@ -306,7 +305,7 @@ class TransportManagerImpl : public TransportManager {
    *
    * @see @ref components_transportmanager_client_connection_management
    */
-  void EventListenerThread(void);
+  void EventListenerThread();
 
   /**
    * @brief store messages
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_event_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_event_impl.cc
index 435bdc53ea..a9523ff8bd 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_event_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_event_impl.cc
@@ -71,11 +71,11 @@ void TransportAdapterEventImpl::set_device_handle(const DeviceUID& device_handle
   device_uid_ = device_handle;
 }
 
-int TransportAdapterEventImpl::event_type(void) const {
+int TransportAdapterEventImpl::event_type() const {
   return event_type_;
 }
 
-ApplicationHandle TransportAdapterEventImpl::application_id(void) const {
+ApplicationHandle TransportAdapterEventImpl::application_id() const {
   return application_id_;
 }
 
@@ -83,7 +83,7 @@ transport_adapter::TransportAdapter* TransportAdapterEventImpl::transport_adapte
   return transport_adapter_;
 }
 
-RawMessagePtr TransportAdapterEventImpl::data(void) const {
+RawMessagePtr TransportAdapterEventImpl::data() const {
   return event_data_;
 }
 
@@ -91,7 +91,7 @@ const DeviceUID& TransportAdapterEventImpl::device_uid() const {
   return device_uid_;
 }
 
-BaseError* TransportAdapterEventImpl::event_error(void) const {
+BaseError* TransportAdapterEventImpl::event_error() const {
   return event_error_;
 }
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 5a1e8f7807..047483fd17 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -315,7 +315,7 @@ int TransportManagerImpl::AddTransportAdapter(
   return E_SUCCESS;
 }
 
-int TransportManagerImpl::SearchDevices(void) {
+int TransportManagerImpl::SearchDevices() {
   if (!this->is_initialized_) {
     LOG4CXX_ERROR(logger_, "TM is not initialized");
     return E_TM_IS_NOT_INITIALIZED;
@@ -364,7 +364,7 @@ int TransportManagerImpl::SearchDevices(void) {
     : E_ADAPTERS_FAIL;
 }
 
-int TransportManagerImpl::Init(void) {
+int TransportManagerImpl::Init() {
   LOG4CXX_INFO(logger_, "Init is called");
   all_thread_active_ = true;
 
@@ -578,7 +578,7 @@ void TransportManagerImpl::OnDeviceListUpdated(TransportAdapter* ta) {
   RaiseEvent(&TransportManagerListener::OnDeviceListUpdated, device_infos);
 }
 
-void TransportManagerImpl::EventListenerThread(void) {
+void TransportManagerImpl::EventListenerThread() {
 #ifndef USE_RWLOCK
   pthread_mutex_lock(&event_queue_mutex_);
 #endif
@@ -791,7 +791,7 @@ void* TransportManagerImpl::MessageQueueStartThread(void* data) {
   return 0;
 }
 
-void TransportManagerImpl::MessageQueueThread(void) {
+void TransportManagerImpl::MessageQueueThread() {
   LOG4CXX_INFO(logger_, "Message queue thread started");
 
 #ifndef USE_RWLOCK
diff --git a/src/components/utils/include/utils/file_system.h b/src/components/utils/include/utils/file_system.h
index 09a2ee5aac..3b23935476 100644
--- a/src/components/utils/include/utils/file_system.h
+++ b/src/components/utils/include/utils/file_system.h
@@ -55,7 +55,7 @@ uint64_t GetAvailableDiskSpace(const std::string& path);
  *
  * @param path to directory
  */
-uint32_t DirectorySize(const std::string& path);
+size_t DirectorySize(const std::string& path);
 
 /*
  * @brief Get size of current file
diff --git a/src/components/utils/src/file_system.cc b/src/components/utils/src/file_system.cc
index a522663cf5..897a2866a3 100644
--- a/src/components/utils/src/file_system.cc
+++ b/src/components/utils/src/file_system.cc
@@ -64,8 +64,8 @@ int64_t file_system::FileSize(const std::string &path) {
   return 0;
 }
 
-uint32_t file_system::DirectorySize(const std::string& path) {
-  uint32_t size = 0;
+size_t file_system::DirectorySize(const std::string& path) {
+  size_t size = 0;
   int32_t return_code = 0;
   DIR* directory = NULL;
 
diff --git a/test/components/application_manager/rpc/include/rpc/application_manager_impl_test.h b/test/components/application_manager/rpc/include/rpc/application_manager_impl_test.h
index 182d3b62c2..422479956a 100644
--- a/test/components/application_manager/rpc/include/rpc/application_manager_impl_test.h
+++ b/test/components/application_manager/rpc/include/rpc/application_manager_impl_test.h
@@ -65,7 +65,7 @@
 #include "interfaces/v4_protocol_v1_2_no_extra.h"
 #include "interfaces/v4_protocol_v1_2_no_extra_schema.h"
 
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 #include "utils/macro.h"
 #include "utils/logger.h"
@@ -179,16 +179,16 @@ class ProtocolHandlerInterceptor : public protocol_handler::ProtocolHandlerImpl
 
   ~ProtocolHandlerInterceptor();
 
-  void SendMessageToMobileApp(const protocol_handler::RawMessagePtr message,
+  void SendMessageToMobileApp(const RawMessagePtr message,
                               bool final_message) OVERRIDE;
 
-  std::list<protocol_handler::RawMessagePtr>* GetMasRawMessage();
+  std::list<RawMessagePtr>* GetMasRawMessage();
 
  private:
   ProtocolHandlerInterceptor* operator=(const ProtocolHandlerInterceptor&);
   ProtocolHandlerInterceptor(const ProtocolHandlerInterceptor&);
 
-  std::list<protocol_handler::RawMessagePtr> mas_mess;
+  std::list<RawMessagePtr> mas_mess;
 };
 
 void RegistrSO(utils::SharedPtr<smart::SmartObject> AppRegRequest);
diff --git a/test/components/application_manager/rpc/include/rpc/protocol_handler_mockup.h b/test/components/application_manager/rpc/include/rpc/protocol_handler_mockup.h
index ea58ec34aa..1ae4b62a99 100644
--- a/test/components/application_manager/rpc/include/rpc/protocol_handler_mockup.h
+++ b/test/components/application_manager/rpc/include/rpc/protocol_handler_mockup.h
@@ -49,7 +49,7 @@
 #include "hmi_message_handler/hmi_message_handler_impl.h"
 #include "hmi_message_handler/messagebroker_adapter.h"
 #include "formatters/CFormatterJsonSDLRPCv2.hpp"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 #include "json/reader.h"
 
 #include "rpc/init_start_data.h"
@@ -70,7 +70,7 @@ namespace test {
         utils::SharedPtr<smart::SmartObject> in_request,
         utils::SharedPtr<smart::SmartObject> in_responce);
 
-    void SendMessageToMobileApp(const protocol_handler::RawMessagePtr message,
+    void SendMessageToMobileApp(const RawMessagePtr message,
                                 bool final_message) OVERRIDE;
 
    private:
diff --git a/test/components/application_manager/rpc/include/rpc/test_app_manager.h b/test/components/application_manager/rpc/include/rpc/test_app_manager.h
index 78292868ac..416d0f922f 100644
--- a/test/components/application_manager/rpc/include/rpc/test_app_manager.h
+++ b/test/components/application_manager/rpc/include/rpc/test_app_manager.h
@@ -1234,7 +1234,7 @@ TEST(TestApplicationManager, OnMobileMessageSent) {
    */
   am::ApplicationManagerImpl* app_manager =
       am::ApplicationManagerImpl::instance();
-  protocol_handler::RawMessagePtr raw_message;
+  RawMessagePtr raw_message;
 
   app_manager->OnMobileMessageSent(raw_message);
 }
@@ -1701,7 +1701,7 @@ TEST(TestApplicationManager, SendMessageToMobile) {
   am::ApplicationManagerImpl* app_manager =
       am::ApplicationManagerImpl::instance();
 
-  std::list<protocol_handler::RawMessagePtr>* array_message;
+  std::list<RawMessagePtr>* array_message;
 
   transport_manager::TransportManager* transport_manager_;
   transport_manager_ = transport_manager::TransportManagerDefault::instance();
diff --git a/test/components/application_manager/rpc/src/application_manager_impl_test.cc b/test/components/application_manager/rpc/src/application_manager_impl_test.cc
index 469770043c..9a0e2977f5 100644
--- a/test/components/application_manager/rpc/src/application_manager_impl_test.cc
+++ b/test/components/application_manager/rpc/src/application_manager_impl_test.cc
@@ -186,13 +186,13 @@ ProtocolHandlerInterceptor::~ProtocolHandlerInterceptor() {
 }
 
 void ProtocolHandlerInterceptor::SendMessageToMobileApp(
-    const protocol_handler::RawMessagePtr message,
+    const RawMessagePtr message,
     bool final_message) {
   printf("\n\n in SendMessageToMobileApp \n\n");
   mas_mess.push_back(message);
 }
 
-std::list<protocol_handler::RawMessagePtr>*
+std::list<RawMessagePtr>*
 ProtocolHandlerInterceptor::GetMasRawMessage() {
   return &mas_mess;
 }
diff --git a/test/components/application_manager/rpc/src/protocol_handler_mockup.cc b/test/components/application_manager/rpc/src/protocol_handler_mockup.cc
index f8e412c580..2edbe70350 100644
--- a/test/components/application_manager/rpc/src/protocol_handler_mockup.cc
+++ b/test/components/application_manager/rpc/src/protocol_handler_mockup.cc
@@ -71,7 +71,7 @@ namespace test {
   }
 
   void ProtocolHandlerMockup::SendMessageToMobileApp(
-      const protocol_handler::RawMessagePtr message, bool final_message) {
+      const RawMessagePtr message, bool final_message) {
     printf("\n\n\n SendMessageToMobileApp \n\n\n");
 
     utils::SharedPtr<application_manager::Message> shared_prt_mes;
diff --git a/test/components/connection_handler/include/connection_handler/connection_handler_impl_test.h b/test/components/connection_handler/include/connection_handler/connection_handler_impl_test.h
index 594926fbd8..9b6ac7bf8f 100644
--- a/test/components/connection_handler/include/connection_handler/connection_handler_impl_test.h
+++ b/test/components/connection_handler/include/connection_handler/connection_handler_impl_test.h
@@ -42,12 +42,6 @@
 #include "security_manager/security_manager_mock.h"
 #include "security_manager/ssl_context_mock.h"
 
-//#include "protocol_handler/protocol_handler_mock.h"
-//#include "protocol_handler/protocol_observer_mock.h"
-//#include "protocol_handler/session_observer_mock.h"
-//#include "security_manager/security_manager_mock.h"
-//#include "transport_manager/transport_manager_mock.h"
-
 namespace test {
 namespace components {
 namespace connection_handle_test {
diff --git a/test/components/include/protocol_handler/control_message_matcher.h b/test/components/include/protocol_handler/control_message_matcher.h
index fedd80f7be..1e9e3bbfef 100644
--- a/test/components/include/protocol_handler/control_message_matcher.h
+++ b/test/components/include/protocol_handler/control_message_matcher.h
@@ -49,7 +49,7 @@ MATCHER_P2(ControlMessage, ExpectedFrameData, ExpectedEncryption,
   // Nack shall be always with flag protected off
   DCHECK(ExpectedFrameData  != 0x03 /*FRAME_DATA_START_SERVICE_NACK*/ ||
          !ExpectedEncryption);
-  const ::protocol_handler::RawMessagePtr message = arg;
+  const RawMessagePtr message = arg;
   const ::protocol_handler::ProtocolPacket packet(
         message->connection_key(), message->data(), message->data_size());
   if (::protocol_handler::FRAME_TYPE_CONTROL != packet.frame_type()) {
diff --git a/test/components/include/protocol_handler/protocol_handler_mock.h b/test/components/include/protocol_handler/protocol_handler_mock.h
index 1574b8dde4..eac9ec4af6 100644
--- a/test/components/include/protocol_handler/protocol_handler_mock.h
+++ b/test/components/include/protocol_handler/protocol_handler_mock.h
@@ -45,7 +45,7 @@ namespace protocol_handler_test {
 class ProtocoloObserverMock: public ::protocol_handler::ProtocolHandler {
  public:
   MOCK_METHOD2(SendMessageToMobileApp,
-               void(const ::protocol_handler::RawMessagePtr message,
+               void(const RawMessagePtr message,
                     bool final_message));
   MOCK_METHOD1(AddProtocolObserver,
                void(::protocol_handler::ProtocolObserver *observer));
diff --git a/test/components/include/protocol_handler/protocol_observer_mock.h b/test/components/include/protocol_handler/protocol_observer_mock.h
index 95a769e921..6153216fff 100644
--- a/test/components/include/protocol_handler/protocol_observer_mock.h
+++ b/test/components/include/protocol_handler/protocol_observer_mock.h
@@ -41,7 +41,6 @@ namespace test {
 namespace components {
 namespace protocol_handler_test {
 
-using ::protocol_handler::RawMessagePtr;
 /*
  * MOCK implementation of ::protocol_handler::ProtocolObserver interface
  */
diff --git a/test/components/include/security_manager/security_manager_mock.h b/test/components/include/security_manager/security_manager_mock.h
index 1d41b05e4e..0a8a9161dd 100644
--- a/test/components/include/security_manager/security_manager_mock.h
+++ b/test/components/include/security_manager/security_manager_mock.h
@@ -66,9 +66,9 @@ class SecurityManagerMock: public ::security_manager::SecurityManager {
                void(::security_manager::SecurityManagerListener *));
   // protocol_handler::ProtocolObserver part
   MOCK_METHOD1(OnMessageReceived,
-               void(const ::protocol_handler::RawMessagePtr));
+               void(const RawMessagePtr));
   MOCK_METHOD1(OnMobileMessageSent,
-               void(const ::protocol_handler::RawMessagePtr));
+               void(const RawMessagePtr));
 };
 }  // namespace security_manager_test
 }  // namespace components
diff --git a/test/components/include/transport_manager/transport_manager_mock.h b/test/components/include/transport_manager/transport_manager_mock.h
index da460199b7..66e4be4258 100644
--- a/test/components/include/transport_manager/transport_manager_mock.h
+++ b/test/components/include/transport_manager/transport_manager_mock.h
@@ -47,7 +47,6 @@ using ::transport_manager::ConnectionUID;
 using ::transport_manager::transport_adapter::TransportAdapter;
 using ::transport_manager::TransportAdapterEventPtr;
 using ::transport_manager::TransportManagerListener;
-using ::protocol_handler::RawMessagePtr;
 /*
  * MOCK implementation of ::transport_manager::TransportManager interface
  */
diff --git a/test/components/transport_manager/include/transport_manager/mock_connection.h b/test/components/transport_manager/include/transport_manager/mock_connection.h
index 64ae8022e5..8f67107065 100644
--- a/test/components/transport_manager/include/transport_manager/mock_connection.h
+++ b/test/components/transport_manager/include/transport_manager/mock_connection.h
@@ -40,7 +40,6 @@
 #include "transport_manager/error.h"
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
 #include "transport_manager/transport_adapter/threaded_socket_connection.h"
-#include "protocol/raw_message.h"
 
 using ::transport_manager::ApplicationHandle;
 using ::transport_manager::DeviceHandle;
@@ -49,7 +48,6 @@ using ::transport_manager::transport_adapter::TransportAdapterController;
 using ::transport_manager::ConnectError;
 using ::transport_manager::transport_adapter::ThreadedSocketConnection;
 using ::transport_manager::transport_adapter::TransportAdapter;
-using ::protocol_handler::RawMessagePtr;
 namespace test {
 namespace components {
 namespace transport_manager {
diff --git a/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h b/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h
index ff2c5083cc..43fa693376 100644
--- a/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h
+++ b/test/components/transport_manager/include/transport_manager/mock_transport_adapter_listener.h
@@ -38,7 +38,6 @@
 
 #include <gmock/gmock.h>
 
-#include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
 
 using namespace transport_manager;
@@ -49,8 +48,6 @@ namespace test {
 namespace components {
 namespace transport_manager {
 
-using ::protocol_handler::RawMessagePtr;
-
 class MockTransportAdapterListener : public TransportAdapterListener {
  public:
   MOCK_METHOD1(OnSearchDeviceDone,
diff --git a/test/components/transport_manager/include/transport_manager/raw_message_matcher.h b/test/components/transport_manager/include/transport_manager/raw_message_matcher.h
index 892fcb4c47..3d7ec5a2b5 100644
--- a/test/components/transport_manager/include/transport_manager/raw_message_matcher.h
+++ b/test/components/transport_manager/include/transport_manager/raw_message_matcher.h
@@ -39,7 +39,7 @@
 #include <gmock/gmock.h>
 
 #include "transport_manager/common.h"
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 
 using ::testing::Matcher;
 using ::testing::MatcherInterface;
@@ -49,9 +49,6 @@ namespace test {
 namespace components {
 namespace transport_manager {
 
-using ::protocol_handler::RawMessage;
-using ::protocol_handler::RawMessagePtr;
-
 class RawMessageMatcher : public MatcherInterface<RawMessagePtr> {
  public:
   explicit RawMessageMatcher(RawMessagePtr ptr);
diff --git a/test/components/transport_manager/src/test_tcp_transport_adapter.cc b/test/components/transport_manager/src/test_tcp_transport_adapter.cc
index e1aedc3cb4..538d7fe89a 100644
--- a/test/components/transport_manager/src/test_tcp_transport_adapter.cc
+++ b/test/components/transport_manager/src/test_tcp_transport_adapter.cc
@@ -10,14 +10,9 @@
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
 #include "transport_manager/mock_transport_adapter_listener.h"
 
-using ::test::components::transport_manager::MockTransportAdapterListener;
-
 namespace transport_manager {
 namespace transport_adapter {
 
-using ::protocol_handler::RawMessage;
-using ::protocol_handler::RawMessagePtr;
-
 TEST(TcpAdapterBasicTest, Basic) {
   TransportAdapter* transport_adapter = new TcpTransportAdapter(12345);
 
@@ -150,7 +145,7 @@ class TcpAdapterTest : public ::testing::Test {
 
   const uint16_t port_;
   TransportAdapter* transport_adapter_;
-  MockTransportAdapterListener mock_dal_;
+  ::test::components::transport_manager::MockTransportAdapterListener mock_dal_;
   ClientTcpSocket client_;
 
   pthread_cond_t suspend_cond_;
diff --git a/test/components/transport_manager/src/transport_manager_test.cc b/test/components/transport_manager/src/transport_manager_test.cc
index d870edc601..a3965e976f 100644
--- a/test/components/transport_manager/src/transport_manager_test.cc
+++ b/test/components/transport_manager/src/transport_manager_test.cc
@@ -34,7 +34,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "protocol/raw_message.h"
+#include "protocol/common.h"
 #include "transport_manager/info.h"
 #include "transport_manager/common.h"
 #include "transport_manager/transport_manager_impl.h"
@@ -48,8 +48,6 @@
 using ::testing::_;
 using ::testing::AtLeast;
 
-using ::protocol_handler::RawMessage;
-
 using ::transport_manager::ApplicationHandle;
 using ::transport_manager::DeviceHandle;
 using ::transport_manager::TransportManager;