diff --git a/Adapter.hh b/Adapter.hh
index 6123d0f..90a7b5a 100644
--- a/Adapter.hh
+++ b/Adapter.hh
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "locked_queue.hh"
-#include <thread>
 #include <functional>
 #include <string>
 #include <pEp/sync_api.h>
diff --git a/Adapter.hxx b/Adapter.hxx
index 3fb539b..4d14a9a 100644
--- a/Adapter.hxx
+++ b/Adapter.hxx
@@ -1,11 +1,13 @@
 #pragma once
 
-#include <functional>
+#include <thread>
+#include "locked_queue.hh"
 
-using namespace std;
 
 namespace pEp {
     namespace Adapter {
+        using std::function;
+    
         extern messageToSend_t _messageToSend;
         extern notifyHandshake_t _notifyHandshake;
         extern std::thread *_sync_thread;
@@ -50,10 +52,10 @@ namespace pEp {
             session();
 
             {
-                lock_guard<mutex> lock(m);
+                std::lock_guard<std::mutex> lock(m);
 
                 if (!_sync_thread)
-                    _sync_thread = new thread(sync_thread<T>, obj, _startup, _shutdown);
+                    _sync_thread = new std::thread(sync_thread<T>, obj, _startup, _shutdown);
             }
         }
     }