diff --git a/Adapter.cc b/Adapter.cc
index 46e52c2..4aa56a6 100644
--- a/Adapter.cc
+++ b/Adapter.cc
@@ -26,7 +26,7 @@ namespace pEp {
     }
 
     RuntimeError::RuntimeError(string _text, PEP_STATUS _status)
-        : text(_text), runtime_error(text.c_str()), status(_status)
+        : runtime_error(_text.c_str()), text(_text),  status(_status)
     {
 
     }
diff --git a/Adapter.hh b/Adapter.hh
index 31f25ed..6de2a46 100644
--- a/Adapter.hh
+++ b/Adapter.hh
@@ -8,7 +8,6 @@
 #include <functional>
 #include <string>
 #include <pEp/sync_api.h>
-#include "Adapter.hxx"
 
 using namespace std;
 
@@ -37,3 +36,5 @@ namespace pEp {
         void shutdown();
     }
 }
+
+#include "Adapter.hxx"