diff --git a/libshvbroker/include/shv/broker/appclioptions.h b/libshvbroker/include/shv/broker/appclioptions.h
index ff536fe1a..a5b9aacf4 100644
--- a/libshvbroker/include/shv/broker/appclioptions.h
+++ b/libshvbroker/include/shv/broker/appclioptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shvbrokerglobal.h"
+#include <shv/broker/shvbrokerglobal.h>
 
 #include <shv/chainpack/rpcvalue.h>
 #include <shv/core/utils/clioptions.h>
diff --git a/libshvbroker/include/shv/broker/azureconfig.h b/libshvbroker/include/shv/broker/azureconfig.h
index 629a0cf1b..facc48ee6 100644
--- a/libshvbroker/include/shv/broker/azureconfig.h
+++ b/libshvbroker/include/shv/broker/azureconfig.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "groupmapping.h"
+#include <shv/broker/groupmapping.h>
 
 #include <string>
 #include <vector>
diff --git a/libshvbroker/include/shv/broker/brokerapp.h b/libshvbroker/include/shv/broker/brokerapp.h
index dcd992aa8..c518dc47d 100644
--- a/libshvbroker/include/shv/broker/brokerapp.h
+++ b/libshvbroker/include/shv/broker/brokerapp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shv/chainpack/rpcdriver.h"
+#include <shv/chainpack/rpcdriver.h>
 #ifdef USE_SHV_PATHS_GRANTS_CACHE
 #include <string>
 
diff --git a/libshvbroker/src/aclmanager.cpp b/libshvbroker/src/aclmanager.cpp
index 657b188dc..f1a8b5b9d 100644
--- a/libshvbroker/src/aclmanager.cpp
+++ b/libshvbroker/src/aclmanager.cpp
@@ -1,6 +1,5 @@
 #include <shv/broker/aclmanager.h>
 #include <shv/broker/brokerapp.h>
-//#include "currentclientshvnode.h"
 
 #include <shv/chainpack/utils.h>
 #include <shv/chainpack/cponreader.h>
diff --git a/libshvbroker/src/aclmanagersqlite.cpp b/libshvbroker/src/aclmanagersqlite.cpp
index 969557192..d07c741c5 100644
--- a/libshvbroker/src/aclmanagersqlite.cpp
+++ b/libshvbroker/src/aclmanagersqlite.cpp
@@ -1,4 +1,5 @@
 #include "aclmanagersqlite.h"
+#include <shv/core/shvcoreglobal.h>
 #include <shv/broker/brokerapp.h>
 
 #include <shv/core/exception.h>
diff --git a/libshvchainpack/c/include/shv/chainpack/ccpon.h b/libshvchainpack/c/include/shv/chainpack/ccpon.h
index c4e4862d8..63bd91b1a 100644
--- a/libshvchainpack/c/include/shv/chainpack/ccpon.h
+++ b/libshvchainpack/c/include/shv/chainpack/ccpon.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ccpcp.h"
+#include <shv/chainpack/ccpcp.h>
 
 #include <time.h>
 
diff --git a/libshvchainpack/include/shv/chainpack/rpcmessage.h b/libshvchainpack/include/shv/chainpack/rpcmessage.h
index 0f993619d..6b956b295 100644
--- a/libshvchainpack/include/shv/chainpack/rpcmessage.h
+++ b/libshvchainpack/include/shv/chainpack/rpcmessage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shv/chainpack/accesslevel.h"
+#include <shv/chainpack/accesslevel.h>
 #include <shv/chainpack/rpcvalue.h>
 #include <shv/chainpack/rpc.h>
 
diff --git a/libshvcore/include/shv/core/assert.h b/libshvcore/include/shv/core/assert.h
index 1298f8832..f274d7f0e 100644
--- a/libshvcore/include/shv/core/assert.h
+++ b/libshvcore/include/shv/core/assert.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "log.h"
-#include "exception.h"
+#include <shv/core/exception.h>
+#include <shv/core/log.h>
 
 #define SHV_EXCEPTION_STRING(cond, message) shvError() << "EXCEPTION:" << "\"" cond"\" -" << message << Q_FUNC_INFO
 #define SHV_ASSERT_STRING(cond, message) shvError() << "\"" cond"\" -" << message << Q_FUNC_INFO
diff --git a/libshvcore/include/shv/core/log.h b/libshvcore/include/shv/core/log.h
index f01e187ec..7bbb6ab84 100644
--- a/libshvcore/include/shv/core/log.h
+++ b/libshvcore/include/shv/core/log.h
@@ -12,7 +12,7 @@
 #define NECROLOG_NO_DEBUG_LOG
 #endif
 
-#include "shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 #include <necrolog.h>
 
 #define shvCDebug(category) nCDebug(category)
diff --git a/libshvcore/include/shv/core/string.h b/libshvcore/include/shv/core/string.h
index 433913a8f..a9310d019 100644
--- a/libshvcore/include/shv/core/string.h
+++ b/libshvcore/include/shv/core/string.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "shvcoreglobal.h"
-#include "stringview.h"
+#include <shv/core/shvcoreglobal.h>
+#include <shv/core/stringview.h>
 
 #include <sstream>
 #include <string>
diff --git a/libshvcore/include/shv/core/stringview.h b/libshvcore/include/shv/core/stringview.h
index b058e90f7..753700b73 100644
--- a/libshvcore/include/shv/core/stringview.h
+++ b/libshvcore/include/shv/core/stringview.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 #include <shv/chainpack/compat.h>
 
 #include <string>
diff --git a/libshvcore/include/shv/core/utils.h b/libshvcore/include/shv/core/utils.h
index b044fc3a3..c24c70fc5 100644
--- a/libshvcore/include/shv/core/utils.h
+++ b/libshvcore/include/shv/core/utils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "shvcoreglobal.h"
-#include "stringview.h"
+#include <shv/core/shvcoreglobal.h>
+#include <shv/core/stringview.h>
 
 #include <shv/chainpack/rpcvalue.h>
 
diff --git a/libshvcore/include/shv/core/utils/abstractshvjournal.h b/libshvcore/include/shv/core/utils/abstractshvjournal.h
index 8afbe8e1a..f10b4a113 100644
--- a/libshvcore/include/shv/core/utils/abstractshvjournal.h
+++ b/libshvcore/include/shv/core/utils/abstractshvjournal.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <string>
 #include <map>
diff --git a/libshvcore/include/shv/core/utils/clioptions.h b/libshvcore/include/shv/core/utils/clioptions.h
index c877d6604..d64e2abcd 100644
--- a/libshvcore/include/shv/core/utils/clioptions.h
+++ b/libshvcore/include/shv/core/utils/clioptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <shv/chainpack/rpcvalue.h>
 
diff --git a/libshvcore/include/shv/core/utils/crypt.h b/libshvcore/include/shv/core/utils/crypt.h
index 2d2acfd92..f0e54571c 100644
--- a/libshvcore/include/shv/core/utils/crypt.h
+++ b/libshvcore/include/shv/core/utils/crypt.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <limits>
 #include <functional>
diff --git a/libshvcore/include/shv/core/utils/patternmatcher.h b/libshvcore/include/shv/core/utils/patternmatcher.h
index 0e2101109..32d605ca7 100644
--- a/libshvcore/include/shv/core/utils/patternmatcher.h
+++ b/libshvcore/include/shv/core/utils/patternmatcher.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "shvgetlogparams.h"
-#include "shvjournalentry.h"
+#include <shv/core/utils/shvgetlogparams.h>
+#include <shv/core/utils/shvjournalentry.h>
 
 #include <regex>
 
diff --git a/libshvcore/include/shv/core/utils/shvalarm.h b/libshvcore/include/shv/core/utils/shvalarm.h
index 9e3b9bc15..5ad8bae58 100644
--- a/libshvcore/include/shv/core/utils/shvalarm.h
+++ b/libshvcore/include/shv/core/utils/shvalarm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <necrologlevel.h>
 
diff --git a/libshvcore/include/shv/core/utils/shvfilejournal.h b/libshvcore/include/shv/core/utils/shvfilejournal.h
index 0e4872667..714ab724f 100644
--- a/libshvcore/include/shv/core/utils/shvfilejournal.h
+++ b/libshvcore/include/shv/core/utils/shvfilejournal.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
-#include "abstractshvjournal.h"
-#include "shvjournalentry.h"
-#include "shvgetlogparams.h"
+#include <shv/core/shvcoreglobal.h>
+#include <shv/core/utils/abstractshvjournal.h>
+#include <shv/core/utils/shvjournalentry.h>
+#include <shv/core/utils/shvgetlogparams.h>
 
 #include <fstream>
 #include <functional>
diff --git a/libshvcore/include/shv/core/utils/shvgetlogparams.h b/libshvcore/include/shv/core/utils/shvgetlogparams.h
index 34634221e..53ba016cc 100644
--- a/libshvcore/include/shv/core/utils/shvgetlogparams.h
+++ b/libshvcore/include/shv/core/utils/shvgetlogparams.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <shv/core/utils/shvjournalcommon.h>
 #include <shv/chainpack/rpcvalue.h>
diff --git a/libshvcore/include/shv/core/utils/shvjournalentry.h b/libshvcore/include/shv/core/utils/shvjournalentry.h
index 5a548ace1..7db8dac88 100644
--- a/libshvcore/include/shv/core/utils/shvjournalentry.h
+++ b/libshvcore/include/shv/core/utils/shvjournalentry.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "shvtypeinfo.h"
+#include <shv/core/utils/shvtypeinfo.h>
 
 #include <shv/chainpack/datachange.h>
 #include <shv/chainpack/rpc.h>
diff --git a/libshvcore/include/shv/core/utils/shvjournalfilereader.h b/libshvcore/include/shv/core/utils/shvjournalfilereader.h
index 27a1f753b..625ca8888 100644
--- a/libshvcore/include/shv/core/utils/shvjournalfilereader.h
+++ b/libshvcore/include/shv/core/utils/shvjournalfilereader.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
-#include "shvjournalentry.h"
-#include "shvtypeinfo.h"
-#include "../exception.h"
+#include <shv/core/shvcoreglobal.h>
+#include <shv/core/utils/shvjournalentry.h>
+#include <shv/core/exception.h>
 
 #include <string>
 #include <fstream>
diff --git a/libshvcore/include/shv/core/utils/shvlogfilereader.h b/libshvcore/include/shv/core/utils/shvlogfilereader.h
index b0f4560b6..4d38eb887 100644
--- a/libshvcore/include/shv/core/utils/shvlogfilereader.h
+++ b/libshvcore/include/shv/core/utils/shvlogfilereader.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "shvlogheader.h"
-#include "shvjournalentry.h"
+#include <shv/core/utils/shvlogheader.h>
+#include <shv/core/utils/shvjournalentry.h>
 
 #include <shv/chainpack/chainpackreader.h>
 
diff --git a/libshvcore/include/shv/core/utils/shvlogfilter.h b/libshvcore/include/shv/core/utils/shvlogfilter.h
index f1476b5f2..89108b914 100644
--- a/libshvcore/include/shv/core/utils/shvlogfilter.h
+++ b/libshvcore/include/shv/core/utils/shvlogfilter.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "abstractshvjournal.h"
-#include "patternmatcher.h"
-#include "shvgetlogparams.h"
+#include <shv/core/utils/abstractshvjournal.h>
+#include <shv/core/utils/patternmatcher.h>
+#include <shv/core/utils/shvgetlogparams.h>
 
 namespace shv::core::utils {
 
diff --git a/libshvcore/include/shv/core/utils/shvlogheader.h b/libshvcore/include/shv/core/utils/shvlogheader.h
index 073aa057e..ffb5c8d33 100644
--- a/libshvcore/include/shv/core/utils/shvlogheader.h
+++ b/libshvcore/include/shv/core/utils/shvlogheader.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "shvtypeinfo.h"
-#include "shvgetlogparams.h"
-#include "../utils.h"
+#include <shv/core/utils/shvtypeinfo.h>
+#include <shv/core/utils/shvgetlogparams.h>
+#include <shv/core/utils.h>
 
 #include <shv/chainpack/rpcvalue.h>
 
diff --git a/libshvcore/include/shv/core/utils/shvlogrpcvaluereader.h b/libshvcore/include/shv/core/utils/shvlogrpcvaluereader.h
index 5e0f54f35..9d5fbd360 100644
--- a/libshvcore/include/shv/core/utils/shvlogrpcvaluereader.h
+++ b/libshvcore/include/shv/core/utils/shvlogrpcvaluereader.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "shvlogheader.h"
-#include "shvjournalentry.h"
+#include <shv/core/utils/shvlogheader.h>
+#include <shv/core/utils/shvjournalentry.h>
 
 namespace shv::core::utils {
 
diff --git a/libshvcore/include/shv/core/utils/shvmemoryjournal.h b/libshvcore/include/shv/core/utils/shvmemoryjournal.h
index 45e572088..ec064f4ab 100644
--- a/libshvcore/include/shv/core/utils/shvmemoryjournal.h
+++ b/libshvcore/include/shv/core/utils/shvmemoryjournal.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "abstractshvjournal.h"
-#include "shvjournalentry.h"
-#include "shvgetlogparams.h"
-#include "shvlogheader.h"
+#include <shv/core/utils/abstractshvjournal.h>
+#include <shv/core/utils/shvjournalentry.h>
+#include <shv/core/utils/shvgetlogparams.h>
+#include <shv/core/utils/shvlogheader.h>
 
 namespace shv::core::utils {
 
diff --git a/libshvcore/include/shv/core/utils/shvpath.h b/libshvcore/include/shv/core/utils/shvpath.h
index 0de240f98..97875f157 100644
--- a/libshvcore/include/shv/core/utils/shvpath.h
+++ b/libshvcore/include/shv/core/utils/shvpath.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
-#include "../string.h"
+#include <shv/core/string.h>
 
 #include <functional>
 #include <map>
diff --git a/libshvcore/include/shv/core/utils/shvtypeinfo.h b/libshvcore/include/shv/core/utils/shvtypeinfo.h
index 687d87af0..0500fbae2 100644
--- a/libshvcore/include/shv/core/utils/shvtypeinfo.h
+++ b/libshvcore/include/shv/core/utils/shvtypeinfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <shv/chainpack/rpcvalue.h>
 
diff --git a/libshvcore/include/shv/core/utils/versioninfo.h b/libshvcore/include/shv/core/utils/versioninfo.h
index 7009079b6..a00008c25 100644
--- a/libshvcore/include/shv/core/utils/versioninfo.h
+++ b/libshvcore/include/shv/core/utils/versioninfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvcoreglobal.h"
+#include <shv/core/shvcoreglobal.h>
 
 #include <compare>
 #include <string>
diff --git a/libshviotqt/include/shv/iotqt/acl/aclmountdef.h b/libshviotqt/include/shv/iotqt/acl/aclmountdef.h
index 2bf34cfad..232c4d505 100644
--- a/libshviotqt/include/shv/iotqt/acl/aclmountdef.h
+++ b/libshviotqt/include/shv/iotqt/acl/aclmountdef.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <string>
 
diff --git a/libshviotqt/include/shv/iotqt/acl/aclrole.h b/libshviotqt/include/shv/iotqt/acl/aclrole.h
index ccc5599d4..7b3d97bab 100644
--- a/libshviotqt/include/shv/iotqt/acl/aclrole.h
+++ b/libshviotqt/include/shv/iotqt/acl/aclrole.h
@@ -2,7 +2,7 @@
 
 #include <shv/iotqt/shviotqtglobal.h>
 
-#include "shv/chainpack/rpcvalue.h"
+#include <shv/chainpack/rpcvalue.h>
 
 #include <string>
 #include <vector>
diff --git a/libshviotqt/include/shv/iotqt/acl/aclroleaccessrules.h b/libshviotqt/include/shv/iotqt/acl/aclroleaccessrules.h
index 8f5283959..52bee1220 100644
--- a/libshviotqt/include/shv/iotqt/acl/aclroleaccessrules.h
+++ b/libshviotqt/include/shv/iotqt/acl/aclroleaccessrules.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <shv/chainpack/accessgrant.h>
 #include <shv/core/utils/shvpath.h>
diff --git a/libshviotqt/include/shv/iotqt/acl/acluser.h b/libshviotqt/include/shv/iotqt/acl/acluser.h
index ca7e21882..d911fdbcb 100644
--- a/libshviotqt/include/shv/iotqt/acl/acluser.h
+++ b/libshviotqt/include/shv/iotqt/acl/acluser.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
-#include "aclpassword.h"
+#include <shv/iotqt/shviotqtglobal.h>
+#include <shv/iotqt/acl/aclpassword.h>
 
 #include <vector>
 
diff --git a/libshviotqt/include/shv/iotqt/node/filenode.h b/libshviotqt/include/shv/iotqt/node/filenode.h
index c5b04a97e..ae1fdc0ff 100644
--- a/libshviotqt/include/shv/iotqt/node/filenode.h
+++ b/libshviotqt/include/shv/iotqt/node/filenode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shvnode.h"
+#include <shv/iotqt/node/shvnode.h>
 #if QT_VERSION_MAJOR >= 6
 #include <shv/coreqt/rpc.h>
 #endif
diff --git a/libshviotqt/include/shv/iotqt/node/localfsnode.h b/libshviotqt/include/shv/iotqt/node/localfsnode.h
index cfb0ee7f2..48f4bd722 100644
--- a/libshviotqt/include/shv/iotqt/node/localfsnode.h
+++ b/libshviotqt/include/shv/iotqt/node/localfsnode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "filenode.h"
+#include <shv/iotqt/node/filenode.h>
 
 #include <QDir>
 #include <QMap>
diff --git a/libshviotqt/include/shv/iotqt/node/shvnodetree.h b/libshviotqt/include/shv/iotqt/node/shvnodetree.h
index 6e704b6a9..a07a6ad35 100644
--- a/libshviotqt/include/shv/iotqt/node/shvnodetree.h
+++ b/libshviotqt/include/shv/iotqt/node/shvnodetree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shvnode.h"
+#include <shv/iotqt/node/shvnode.h>
 
 #include <QObject>
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/clientappclioptions.h b/libshviotqt/include/shv/iotqt/rpc/clientappclioptions.h
index 84ebf47f2..61a2d5e6f 100644
--- a/libshviotqt/include/shv/iotqt/rpc/clientappclioptions.h
+++ b/libshviotqt/include/shv/iotqt/rpc/clientappclioptions.h
@@ -2,7 +2,7 @@
 
 #include <shv/core/utils/clioptions.h>
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 namespace shv::iotqt::rpc {
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/clientconnection.h b/libshviotqt/include/shv/iotqt/rpc/clientconnection.h
index e23e3e6e3..7fd63125d 100644
--- a/libshviotqt/include/shv/iotqt/rpc/clientconnection.h
+++ b/libshviotqt/include/shv/iotqt/rpc/clientconnection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "socketrpcconnection.h"
+#include <shv/iotqt/rpc/socketrpcconnection.h>
 
 #include <shv/chainpack/rpcmessage.h>
 #include <shv/chainpack/rpcdriver.h>
diff --git a/libshviotqt/include/shv/iotqt/rpc/deviceappclioptions.h b/libshviotqt/include/shv/iotqt/rpc/deviceappclioptions.h
index 38a3558c9..445f1c376 100644
--- a/libshviotqt/include/shv/iotqt/rpc/deviceappclioptions.h
+++ b/libshviotqt/include/shv/iotqt/rpc/deviceappclioptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "clientappclioptions.h"
+#include <shv/iotqt/rpc/clientappclioptions.h>
 
 namespace shv::iotqt::rpc {
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/deviceconnection.h b/libshviotqt/include/shv/iotqt/rpc/deviceconnection.h
index e8981e015..fcaab365b 100644
--- a/libshviotqt/include/shv/iotqt/rpc/deviceconnection.h
+++ b/libshviotqt/include/shv/iotqt/rpc/deviceconnection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "clientconnection.h"
+#include <shv/iotqt/rpc/clientconnection.h>
 
 namespace shv::iotqt::rpc {
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/localsocket.h b/libshviotqt/include/shv/iotqt/rpc/localsocket.h
index 63fe5a652..f55f71685 100644
--- a/libshviotqt/include/shv/iotqt/rpc/localsocket.h
+++ b/libshviotqt/include/shv/iotqt/rpc/localsocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "socket.h"
+#include <shv/iotqt/rpc/socket.h>
 
 class QLocalSocket;
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/rpccall.h b/libshviotqt/include/shv/iotqt/rpc/rpccall.h
index ba2fe55b8..43155e635 100644
--- a/libshviotqt/include/shv/iotqt/rpc/rpccall.h
+++ b/libshviotqt/include/shv/iotqt/rpc/rpccall.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <shv/coreqt/rpc.h>
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/serialportsocket.h b/libshviotqt/include/shv/iotqt/rpc/serialportsocket.h
index ebbfdd810..332e8977b 100644
--- a/libshviotqt/include/shv/iotqt/rpc/serialportsocket.h
+++ b/libshviotqt/include/shv/iotqt/rpc/serialportsocket.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
-#include "socket.h"
+#include <shv/iotqt/shviotqtglobal.h>
+#include <shv/iotqt/rpc/socket.h>
 
 #include <shv/chainpack/crc32.h>
 #include <shv/coreqt/log.h>
diff --git a/libshviotqt/include/shv/iotqt/rpc/serverconnection.h b/libshviotqt/include/shv/iotqt/rpc/serverconnection.h
index 2652cd788..48f82ecb6 100644
--- a/libshviotqt/include/shv/iotqt/rpc/serverconnection.h
+++ b/libshviotqt/include/shv/iotqt/rpc/serverconnection.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
-#include "socketrpcconnection.h"
+#include <shv/iotqt/shviotqtglobal.h>
+#include <shv/iotqt/rpc/socketrpcconnection.h>
 
 #include <shv/chainpack/irpcconnection.h>
 #include <shv/chainpack/rpcmessage.h>
diff --git a/libshviotqt/include/shv/iotqt/rpc/socket.h b/libshviotqt/include/shv/iotqt/rpc/socket.h
index 3e11a203b..a7b675246 100644
--- a/libshviotqt/include/shv/iotqt/rpc/socket.h
+++ b/libshviotqt/include/shv/iotqt/rpc/socket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <shv/chainpack/rpcmessage.h>
 
diff --git a/libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h b/libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h
index b3ea437c2..6938d921a 100644
--- a/libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h
+++ b/libshviotqt/include/shv/iotqt/rpc/socketrpcconnection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <shv/chainpack/irpcconnection.h>
 #include <shv/chainpack/rpcdriver.h>
diff --git a/libshviotqt/include/shv/iotqt/rpc/tcpserver.h b/libshviotqt/include/shv/iotqt/rpc/tcpserver.h
index 83ae244ca..483b3b131 100644
--- a/libshviotqt/include/shv/iotqt/rpc/tcpserver.h
+++ b/libshviotqt/include/shv/iotqt/rpc/tcpserver.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <shv/core/utils.h>
 #include <shv/chainpack/rpcvalue.h>
diff --git a/libshviotqt/include/shv/iotqt/rpc/websocket.h b/libshviotqt/include/shv/iotqt/rpc/websocket.h
index b2dcfaac5..b69b3ae94 100644
--- a/libshviotqt/include/shv/iotqt/rpc/websocket.h
+++ b/libshviotqt/include/shv/iotqt/rpc/websocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "socket.h"
+#include <shv/iotqt/rpc/socket.h>
 
 class QWebSocket;
 
diff --git a/libshviotqt/include/shv/iotqt/utils.h b/libshviotqt/include/shv/iotqt/utils.h
index a04f47418..46a9533b8 100644
--- a/libshviotqt/include/shv/iotqt/utils.h
+++ b/libshviotqt/include/shv/iotqt/utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 #include <string>
 
 namespace shv::iotqt::utils {
diff --git a/libshviotqt/include/shv/iotqt/utils/network.h b/libshviotqt/include/shv/iotqt/utils/network.h
index 59034a6bd..89281129c 100644
--- a/libshviotqt/include/shv/iotqt/utils/network.h
+++ b/libshviotqt/include/shv/iotqt/utils/network.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shviotqtglobal.h"
+#include <shv/iotqt/shviotqtglobal.h>
 
 #include <QString>
 
diff --git a/libshvvisu/include/shv/visu/logview/dataviewwidget.h b/libshvvisu/include/shv/visu/logview/dataviewwidget.h
index de41685b3..aeac7b5f5 100644
--- a/libshvvisu/include/shv/visu/logview/dataviewwidget.h
+++ b/libshvvisu/include/shv/visu/logview/dataviewwidget.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <shv/visu/timeline/graph.h>
 
diff --git a/libshvvisu/include/shv/visu/logview/dlgloginspector.h b/libshvvisu/include/shv/visu/logview/dlgloginspector.h
index a1580e88e..642d2696f 100644
--- a/libshvvisu/include/shv/visu/logview/dlgloginspector.h
+++ b/libshvvisu/include/shv/visu/logview/dlgloginspector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <shv/core/utils.h>
 
diff --git a/libshvvisu/include/shv/visu/logview/logmodel.h b/libshvvisu/include/shv/visu/logview/logmodel.h
index 897841c23..4c856479a 100644
--- a/libshvvisu/include/shv/visu/logview/logmodel.h
+++ b/libshvvisu/include/shv/visu/logview/logmodel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <shv/chainpack/rpcvalue.h>
 #include <shv/core/utils/shvmemoryjournal.h>
diff --git a/libshvvisu/include/shv/visu/logview/logsortfilterproxymodel.h b/libshvvisu/include/shv/visu/logview/logsortfilterproxymodel.h
index cbb4bb359..c00b3f940 100644
--- a/libshvvisu/include/shv/visu/logview/logsortfilterproxymodel.h
+++ b/libshvvisu/include/shv/visu/logview/logsortfilterproxymodel.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
-#include "../timeline/channelfilter.h"
-#include "../timeline/fulltextfilter.h"
+#include <shv/visu/shvvisuglobal.h>
+#include <shv/visu/timeline/channelfilter.h>
+#include <shv/visu/timeline/fulltextfilter.h>
 
 #include <QSortFilterProxyModel>
 #include <optional>
diff --git a/libshvvisu/include/shv/visu/svgscene/graphicsview.h b/libshvvisu/include/shv/visu/svgscene/graphicsview.h
index 55d1e1a29..efcd55bcb 100644
--- a/libshvvisu/include/shv/visu/svgscene/graphicsview.h
+++ b/libshvvisu/include/shv/visu/svgscene/graphicsview.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QGraphicsView>
 
diff --git a/libshvvisu/include/shv/visu/svgscene/groupitem.h b/libshvvisu/include/shv/visu/svgscene/groupitem.h
index 301af3c62..763f8b542 100644
--- a/libshvvisu/include/shv/visu/svgscene/groupitem.h
+++ b/libshvvisu/include/shv/visu/svgscene/groupitem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QGraphicsItem>
 
diff --git a/libshvvisu/include/shv/visu/svgscene/saxhandler.h b/libshvvisu/include/shv/visu/svgscene/saxhandler.h
index 435d2f589..84e53d16f 100644
--- a/libshvvisu/include/shv/visu/svgscene/saxhandler.h
+++ b/libshvvisu/include/shv/visu/svgscene/saxhandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include <shv/visu/svgscene/types.h>
 
 #include <QPen>
 #include <QMap>
diff --git a/libshvvisu/include/shv/visu/svgscene/simpletextitem.h b/libshvvisu/include/shv/visu/svgscene/simpletextitem.h
index 24ede80c3..c83739638 100644
--- a/libshvvisu/include/shv/visu/svgscene/simpletextitem.h
+++ b/libshvvisu/include/shv/visu/svgscene/simpletextitem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "saxhandler.h"
+#include <shv/visu/svgscene/saxhandler.h>
 
 #include <QGraphicsItem>
 
diff --git a/libshvvisu/include/shv/visu/svgscene/types.h b/libshvvisu/include/shv/visu/svgscene/types.h
index 98b52e566..66770a62b 100644
--- a/libshvvisu/include/shv/visu/svgscene/types.h
+++ b/libshvvisu/include/shv/visu/svgscene/types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QString>
 #include <QMap>
diff --git a/libshvvisu/include/shv/visu/svgscene/visucontroller.h b/libshvvisu/include/shv/visu/svgscene/visucontroller.h
index 9f4403677..3b49c1ff5 100644
--- a/libshvvisu/include/shv/visu/svgscene/visucontroller.h
+++ b/libshvvisu/include/shv/visu/svgscene/visucontroller.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "saxhandler.h"
-#include "types.h"
+#include <shv/visu/svgscene/saxhandler.h>
+#include <shv/visu/svgscene/types.h>
 
 #include <shv/core/utils.h>
 
diff --git a/libshvvisu/include/shv/visu/timeline/channelfilter.h b/libshvvisu/include/shv/visu/timeline/channelfilter.h
index 1cdcb6ebc..53abbfdfc 100644
--- a/libshvvisu/include/shv/visu/timeline/channelfilter.h
+++ b/libshvvisu/include/shv/visu/timeline/channelfilter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QSet>
 #include <QRegularExpression>
diff --git a/libshvvisu/include/shv/visu/timeline/channelfilterdialog.h b/libshvvisu/include/shv/visu/timeline/channelfilterdialog.h
index 7793c813c..66e29cb27 100644
--- a/libshvvisu/include/shv/visu/timeline/channelfilterdialog.h
+++ b/libshvvisu/include/shv/visu/timeline/channelfilterdialog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 #include <shv/visu/timeline/graph.h>
 
 #include <QDialog>
diff --git a/libshvvisu/include/shv/visu/timeline/channelfiltermodel.h b/libshvvisu/include/shv/visu/timeline/channelfiltermodel.h
index 7e1bacb51..d47c3ffed 100644
--- a/libshvvisu/include/shv/visu/timeline/channelfiltermodel.h
+++ b/libshvvisu/include/shv/visu/timeline/channelfiltermodel.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
-#include "graph.h"
+#include <shv/visu/shvvisuglobal.h>
+#include <shv/visu/timeline/graph.h>
 
 #include <QStandardItemModel>
 #include <shv/core/stringview.h>
diff --git a/libshvvisu/include/shv/visu/timeline/fulltextfilter.h b/libshvvisu/include/shv/visu/timeline/fulltextfilter.h
index 9a00087eb..aa243d4c9 100644
--- a/libshvvisu/include/shv/visu/timeline/fulltextfilter.h
+++ b/libshvvisu/include/shv/visu/timeline/fulltextfilter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QRegularExpression>
 #include <QString>
diff --git a/libshvvisu/include/shv/visu/timeline/graph.h b/libshvvisu/include/shv/visu/timeline/graph.h
index a954ee0b3..05176ba2c 100644
--- a/libshvvisu/include/shv/visu/timeline/graph.h
+++ b/libshvvisu/include/shv/visu/timeline/graph.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "channelfilter.h"
-#include "channelprobe.h"
-#include "graphchannel.h"
-#include "graphmodel.h"
-#include "sample.h"
-#include "../shvvisuglobal.h"
+#include <shv/visu/timeline/channelfilter.h>
+#include <shv/visu/timeline/channelprobe.h>
+#include <shv/visu/timeline/graphchannel.h>
+#include <shv/visu/timeline/graphmodel.h>
+#include <shv/visu/timeline/sample.h>
+#include <shv/visu/shvvisuglobal.h>
 
 #include <shv/coreqt/utils.h>
 #include <shv/core/exception.h>
diff --git a/libshvvisu/include/shv/visu/timeline/graphmodel.h b/libshvvisu/include/shv/visu/timeline/graphmodel.h
index 3b4dec10b..2bceaa298 100644
--- a/libshvvisu/include/shv/visu/timeline/graphmodel.h
+++ b/libshvvisu/include/shv/visu/timeline/graphmodel.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "sample.h"
-#include "../shvvisuglobal.h"
+#include <shv/visu/timeline/sample.h>
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QObject>
 #include <QVariant>
diff --git a/libshvvisu/include/shv/visu/timeline/sample.h b/libshvvisu/include/shv/visu/timeline/sample.h
index b79a926ab..2f626a52c 100644
--- a/libshvvisu/include/shv/visu/timeline/sample.h
+++ b/libshvvisu/include/shv/visu/timeline/sample.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../shvvisuglobal.h"
+#include <shv/visu/shvvisuglobal.h>
 
 #include <QVariant>
 
diff --git a/libshvvisu/src/logview/dataviewwidget.cpp b/libshvvisu/src/logview/dataviewwidget.cpp
index bf8afc867..188159a6a 100644
--- a/libshvvisu/src/logview/dataviewwidget.cpp
+++ b/libshvvisu/src/logview/dataviewwidget.cpp
@@ -4,7 +4,7 @@
 #include <shv/visu/timeline/graph.h>
 #include <shv/visu/timeline/channelfilterdialog.h>
 
-#include "shv/core/log.h"
+#include <shv/core/log.h>
 
 namespace tl = shv::visu::timeline;