diff --git a/src/Adapter.cc b/src/Adapter.cc
index 359e1aa..235bf19 100644
--- a/src/Adapter.cc
+++ b/src/Adapter.cc
@@ -6,7 +6,7 @@
 #include <iomanip>
 #include <assert.h>
 #include "status_to_string.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "passphrase_cache.hh"
 #include "callback_dispatcher.hh"
 #include "group_manager_api.h"
diff --git a/src/Adapter.hxx b/src/Adapter.hxx
index f5732ad..5d629eb 100644
--- a/src/Adapter.hxx
+++ b/src/Adapter.hxx
@@ -5,9 +5,9 @@
 #define LIBPEPADAPTER_ADAPTER_HXX
 
 #include <thread>
-#include "locked_queue.hh"
+#include <pEp/locked_queue.hh>
 #include <cassert>
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <atomic>
 
 namespace pEp {
diff --git a/src/callback_dispatcher.hh b/src/callback_dispatcher.hh
index 8dfd272..c13e4c0 100644
--- a/src/callback_dispatcher.hh
+++ b/src/callback_dispatcher.hh
@@ -8,7 +8,7 @@
 #include <functional>
 #include <mutex>
 
-#include "Semaphore.hh"
+#include <pEp/Semaphore.hh>
 #include "passphrase_cache.hh"
 #include <pEp/sync_api.h>
 namespace pEp {
diff --git a/src/group_manager_api.cc b/src/group_manager_api.cc
index 4b70b92..a30fdab 100644
--- a/src/group_manager_api.cc
+++ b/src/group_manager_api.cc
@@ -4,7 +4,7 @@
 // clang-format off
 #include "group_manager_api.h"
 #include "grp_driver_replicator.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "grp_driver_dummy.hh"
 #include "grp_driver_engine.hh"
 
diff --git a/src/grp_driver_dummy.cc b/src/grp_driver_dummy.cc
index cf67383..84e17f3 100644
--- a/src/grp_driver_dummy.cc
+++ b/src/grp_driver_dummy.cc
@@ -1,7 +1,7 @@
 #include "grp_driver_dummy.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "utils.hh"
-#include "std_utils.hh"
+#include <pEp/std_utils.hh>
 #include <pEp/message_api.h>
 #include "listmanager_dummy.hh"
 
diff --git a/src/grp_driver_dummy.hh b/src/grp_driver_dummy.hh
index 1c72da0..8a7f408 100644
--- a/src/grp_driver_dummy.hh
+++ b/src/grp_driver_dummy.hh
@@ -4,7 +4,7 @@
 #define LIBPEPADAPTER_GRP_DRIVER_DUMMY_HH
 
 #include "grp_manager_interface.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include "listmanager_dummy.hh"
 #include <pEp/message_api.h>
 
diff --git a/src/grp_driver_engine.cc b/src/grp_driver_engine.cc
index 2a37574..60068bb 100644
--- a/src/grp_driver_engine.cc
+++ b/src/grp_driver_engine.cc
@@ -1,5 +1,5 @@
 #include "grp_driver_engine.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <pEp/message_api.h>
 #include <pEp/group.h>
 
diff --git a/src/grp_driver_engine.hh b/src/grp_driver_engine.hh
index caec9f9..dadebb7 100644
--- a/src/grp_driver_engine.hh
+++ b/src/grp_driver_engine.hh
@@ -4,7 +4,7 @@
 #define LIBPEPADAPTER_GRP_DRIVER_ENGINE_HH
 
 #include "grp_manager_interface.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <pEp/message_api.h>
 
 namespace pEp {
diff --git a/src/grp_driver_replicator.hh b/src/grp_driver_replicator.hh
index 600a3c9..d33f1b5 100644
--- a/src/grp_driver_replicator.hh
+++ b/src/grp_driver_replicator.hh
@@ -7,7 +7,7 @@
 #include "grp_manager_interface.hh"
 #include "grp_driver_engine.hh"
 #include "grp_driver_dummy.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <pEp/message_api.h>
 
 namespace pEp {
diff --git a/src/listmanager_dummy.hh b/src/listmanager_dummy.hh
index 666e324..b3edfff 100644
--- a/src/listmanager_dummy.hh
+++ b/src/listmanager_dummy.hh
@@ -5,7 +5,7 @@
 #define LIBPEPADAPTER_LISTMANAGER_DUMMY_HH
 
 #include "pEpSQLite.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <vector>
 #include <string>
 
diff --git a/src/pEpSQLite.cc b/src/pEpSQLite.cc
index 219cfef..0051038 100644
--- a/src/pEpSQLite.cc
+++ b/src/pEpSQLite.cc
@@ -1,5 +1,5 @@
 #include "pEpSQLite.hh"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <iostream>
 #include <cstdio>
 #include <stdexcept>
diff --git a/src/pEpSQLite.hh b/src/pEpSQLite.hh
index f1ccdfc..11a2adc 100644
--- a/src/pEpSQLite.hh
+++ b/src/pEpSQLite.hh
@@ -4,7 +4,7 @@
 #define LIBPEPADAPTER_PEPSQLITE_HH
 
 #include "internal/sqlite3.h"
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <iostream>
 #include <vector>
 #include <map>
diff --git a/src/utils.hh b/src/utils.hh
index a59db2a..8ef4713 100644
--- a/src/utils.hh
+++ b/src/utils.hh
@@ -4,7 +4,7 @@
 #ifndef LIBPEPADAPTER_UTILS_HH
 #define LIBPEPADAPTER_UTILS_HH
 
-#include "pEpLog.hh"
+#include <pEp/pEpLog.hh>
 #include <pEp/message.h>
 #include <pEp/identity_list.h>
 #include <pEp/group.h>