1 files changed, 6 insertions, 4 deletions
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 851f250a88..399ddb1fcf 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
@@ -1,4 +1,4 @@
-/**
+/*
  * \file threaded_socket_connection.h
  * \brief Header for classes responsible for communication over sockets.
  * Copyright (c) 2013, Ford Motor Company
@@ -41,10 +41,12 @@
 #include "transport_manager/transport_adapter/connection.h"
 #include "protocol/common.h"
 #include "utils/threads/thread_delegate.h"
-#include "utils/threads/thread.h"
+#include "utils/lock.h"
 
 using ::transport_manager::transport_adapter::Connection;
 
+class Thread;
+
 namespace transport_manager {
 namespace transport_adapter {
 
@@ -133,7 +135,7 @@ class ThreadedSocketConnection : public Connection,
   int read_fd_;
   int write_fd_;
   void threadMain();
-  bool exitThreadMain();
+  void exitThreadMain();
   void Transmit();
   void Finalize();
   TransportAdapter::Error Notify() const;
@@ -147,7 +149,7 @@ class ThreadedSocketConnection : public Connection,
    **/
   typedef std::queue<protocol_handler::RawMessagePtr> FrameQueue;
   FrameQueue frames_to_send_;
-  mutable pthread_mutex_t frames_to_send_mutex_;
+  mutable sync_primitives::Lock frames_to_send_mutex_;
 
   int socket_;
   bool terminate_flag_;