diff --git a/src/Makefile b/src/Makefile
index 2b3b74b..850134e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,7 @@
 include ../Makefile.conf
 
 SOURCE=$(wildcard *.cc)
-HEADERS=$(wildcard *.hh *.hxx)
+HEADERS=$(wildcard *.hh *.hxx *.h)
 OBJECTS=$(subst .cc,.o,$(SOURCE))
 DEPENDS=$(subst .cc,.d,$(SOURCE))
 CXXFLAGS+= -MMD -MP
diff --git a/src/adapter_group.h b/src/adapter_group.h
index 2402d7c..67919b7 100644
--- a/src/adapter_group.h
+++ b/src/adapter_group.h
@@ -4,6 +4,8 @@
 #ifndef LIBPEPADAPTER_GROUP_HH
 #define LIBPEPADAPTER_GROUP_HH
 
+#include <pEp/message_api.h>
+#include <pEp/group.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/Makefile b/test/Makefile
index 7f6045f..62e81de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,17 +3,24 @@ include ../Makefile.conf
 LDFLAGS=-L../src $(ENGINE_LIB)
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
 CXXFLAGS:=-I../src -DENGINE_TEST=$(ENGINE_TEST) $(CXXFLAGS)
-SRC=$(wildcard test_*.cc)
-TST=$(subst .cc,,$(SRC))
 
-all: $(TST)
+SRC_TEST=$(wildcard test_*.cc)
+BIN_TEST=$(subst .cc,,$(SRC_TEST))
 
-$(TST): framework.o
+SRC_FRAMEWORK=$(wildcard framework/*.cc)
+OBJ_FRAMEWORK=$(subst .cc,.o,$(SRC_FRAMEWORK))
+
+.PHONY: all clean rmtestdata
+
+all: $(BIN_TEST)
+
+
+$(BIN_TEST): $(OBJ_FRAMEWORK)
 
-.PHONY: clean rmtestdata
 
 clean:
-	rm -f $(TST)
+	rm -f $(BIN_TEST)
+	rm -f $(OBJ_FRAMEWORK)
 	rm -Rf *.dSYM
 	rm -f *.o
 	rm -Rf /tmp/test_pEp.*
diff --git a/test/framework.cc b/test/framework/framework.cc
similarity index 98%
rename from test/framework.cc
rename to test/framework/framework.cc
index 70bb0a1..ffb3e1c 100644
--- a/test/framework.cc
+++ b/test/framework/framework.cc
@@ -8,7 +8,6 @@
 #include <utility>
 #include <exception>
 #include <thread>
-
 #include <unistd.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -22,7 +21,7 @@
 #include <pEp/sync_codec.h>
 #include <pEp/distribution_codec.h>
 
-#include <Adapter.hh>
+#include "../src/Adapter.hh"
 
 pEp::Test::Transport pEp::Test::transport;
 std::string pEp::Test::path;
@@ -74,8 +73,9 @@ namespace pEp {
         void setup(int argc, char **argv)
         {
             vector<string> args{ (size_t)argc };
-            for (int i = 0; i < argc; ++i)
+            for (int i = 0; i < argc; ++i) {
                 args[i] = argv[i];
+            }
 
             setup(args);
         }
diff --git a/test/framework.hh b/test/framework/framework.hh
similarity index 98%
rename from test/framework.hh
rename to test/framework/framework.hh
index 9b04a6b..6052cec 100644
--- a/test/framework.hh
+++ b/test/framework/framework.hh
@@ -10,10 +10,10 @@
 
 #include <pEp/message.h>
 
+using namespace std;
+
 namespace pEp {
     namespace Test {
-        using namespace std;
-
         // manually set up test
         void setup(vector<string> &args);
 
diff --git a/test/test_adapter.cc b/test/test_adapter.cc
index ee0bd5e..b0e8954 100644
--- a/test/test_adapter.cc
+++ b/test/test_adapter.cc
@@ -1,18 +1,19 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#include "framework.hh"
+#include "framework/framework.hh"
 #include <iostream>
 #include <assert.h>
 #include <unistd.h>
 #include <sys/param.h>
 
-#include <pEpLog.hh>
-#include <Adapter.hh>
 #include <pEp/sync_api.h>
 #include <pEp/keymanagement.h>
 #include <pEp/message_api.h>
 
+#include "../src/pEpLog.hh"
+#include "../src/Adapter.hh"
+
 using namespace std;
 using namespace pEp;
 
diff --git a/test/test_adapter_cxx.cc b/test/test_adapter_cxx.cc
index 9091abf..758c894 100644
--- a/test/test_adapter_cxx.cc
+++ b/test/test_adapter_cxx.cc
@@ -1,16 +1,16 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#include "framework.hh"
+#include "framework/framework.hh"
 #include <iostream>
 #include <assert.h>
 #include <unistd.h>
 
 #include <pEp/keymanagement.h>
-#include <pEpLog.hh>
 #include <pEp/sync_api.h>
 
-#include <Adapter.hh>
+#include "../src/Adapter.hh"
+#include "../src/pEpLog.hh"
 
 using namespace pEp;
 
diff --git a/test/test_ensure_passphrase.cc b/test/test_ensure_passphrase.cc
index a4cfa9f..c1cda6d 100644
--- a/test/test_ensure_passphrase.cc
+++ b/test/test_ensure_passphrase.cc
@@ -1,6 +1,8 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
+#include "framework/framework.hh"
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -10,16 +12,14 @@
 #include <string.h>
 #include <sys/param.h>
 
-#include "framework.hh"
-
-#include <passphrase_cache.hh>
-#include <status_to_string.hh>
-#include <Adapter.hh>
-
 #include <pEp/message_api.h>
 #include <pEp/keymanagement.h>
 #include <pEp/key_reset.h>
 
+#include "../src/passphrase_cache.hh"
+#include "../src/status_to_string.hh"
+#include "../src/Adapter.hh"
+
 using namespace pEp;
 using namespace std;
 
diff --git a/test/test_leave_device_group.cc b/test/test_leave_device_group.cc
index 33bdac5..6cfcf71 100644
--- a/test/test_leave_device_group.cc
+++ b/test/test_leave_device_group.cc
@@ -1,16 +1,17 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
+#include "framework/framework.hh"
+
 #include <iostream>
 #include <vector>
 #include <unistd.h>
 
-#include "framework.hh"
-#include <passphrase_cache.hh>
-#include <callback_dispatcher.hh>
-
 #include <pEp/sync_api.h>
 
+#include "../src/callback_dispatcher.hh"
+#include "../src/passphrase_cache.hh"
+
 using namespace std;
 using namespace pEp;
 
diff --git a/test/test_message_cache.cc b/test/test_message_cache.cc
index 6c35b1b..fc240f9 100644
--- a/test/test_message_cache.cc
+++ b/test/test_message_cache.cc
@@ -1,13 +1,15 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#include "framework.hh"
+#include "framework/framework.hh"
+
 #include <iostream>
 #include <cassert>
 #include <sys/param.h>
 #include <unistd.h>
-#include <message_cache.hh>
-#include <Adapter.hh>
+
+#include "../src/message_cache.hh"
+#include "../src/Adapter.hh"
 
 using namespace std;
 using namespace pEp;
diff --git a/test/test_passphrase_cache.cc b/test/test_passphrase_cache.cc
index 32ca34e..016ea84 100644
--- a/test/test_passphrase_cache.cc
+++ b/test/test_passphrase_cache.cc
@@ -1,16 +1,16 @@
 // This file is under GNU General Public License 3.0
 // see LICENSE.txt
 
-#include "framework.hh"
+#include "framework/framework.hh"
 
 #include <iostream>
 #include <unistd.h>
 #include <assert.h>
-
 #include <sys/param.h>
-#include <passphrase_cache.hh>
-#include <status_to_string.hh>
-#include <Adapter.hh>
+
+#include "../src/passphrase_cache.hh"
+#include "../src/status_to_string.hh"
+#include "../src/Adapter.hh"
 
 using namespace pEp;
 
diff --git a/test/test_semaphore.cc b/test/test_semaphore.cc
index 55196b6..1a5eafb 100644
--- a/test/test_semaphore.cc
+++ b/test/test_semaphore.cc
@@ -4,7 +4,8 @@
 #include <iostream>
 #include <thread>
 #include <unistd.h>
-#include "Semaphore.hh"
+
+#include "../src/Semaphore.hh"
 
 using namespace std;
 using namespace pEp;