diff --git a/Makefile b/Makefile
index fe76077..ff570e6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 include Makefile.conf
 
 LDFLAGS:=$(LDFLAGS)
-LDLIBS=-lstdc++ -lpthread -lpEpEngine -lpEpAdapter -ldl
+LDLIBS=-lstdc++ -lpthread -lpEpEngine -lpEpCxx11 -lpEpAdapter -ldl
 CXXFLAGS:=-I./src $(CXXFLAGS)
 
 # Src
diff --git a/src/test_utils.hh b/src/test_utils.hh
index 89af446..b4dd069 100644
--- a/src/test_utils.hh
+++ b/src/test_utils.hh
@@ -11,6 +11,7 @@
 #include <thread>
 #include <cstring>
 #include <tuple>
+#include <memory>
 #include <pEp/pEpEngine.h>
 #include <pEp/identity_list.h>
 #include <pEp/message.h>