diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..886ff314
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,64 @@
+name: CI
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
+jobs:
+  test-linux:
+    runs-on: ubuntu-latest
+    env:
+      CCACHE_DIR: ${{github.workspace}}/ccache
+      CCACHE_MAXSIZE: 100M
+    strategy:
+      matrix:
+        tag:
+          - minimal
+          - system-libs
+          - bundled-libs
+        include:
+          - tag: minimal
+            deps: |
+              libb2-dev
+              libqca-qt5-2-dev
+            options: -DIRIS_ENABLE_JINGLE_SCTP=OFF
+          - tag: system-libs
+            deps: |
+              libb2-dev
+              libqca-qt5-2-dev
+              libusrsctp-dev
+            options: -DIRIS_BUNDLED_QCA=OFF -DIRIS_BUNDLED_USRSCTP=OFF
+          - tag: bundled-libs
+            deps: null
+            options: -DIRIS_BUNDLED_QCA=ON -DIRIS_BUNDLED_USRSCTP=ON
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: |
+            ${{matrix.deps}}
+            ccache
+            ninja-build
+            qtbase5-dev
+          version: ${{matrix.tag}}
+      - name: Configure
+        run: |
+          cmake -B ${{github.workspace}}/build -G Ninja \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            ${{matrix.options}}
+      - name: Restore cache
+        uses: actions/cache/restore@v3
+        with:
+          key: ccache-linux-${{matrix.tag}}
+          path: ${{github.workspace}}/ccache
+      - name: Build
+        run: |
+          cmake --build ${{github.workspace}}/build -v -j $(nproc)
+      - name: Save cache
+        uses: actions/cache@v3
+        with:
+          key: ccache-linux-${{matrix.tag}}
+          path: ${{github.workspace}}/ccache
diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index 2ad9c7f9..0e0684fe 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-project(stringprep LANGUAGES CXX)
-
+project(stringprep
+    LANGUAGES CXX
+)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -14,13 +15,12 @@ add_library(stringprep STATIC
     profiles.cpp
     rfc3454.cpp
 )
+
 target_compile_definitions(stringprep PRIVATE QSTRINGPREP_BUILDING)
-target_include_directories(stringprep PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
 
 if(MSVC)
   target_compile_definitions(stringprep PRIVATE _CRT_SECURE_NO_WARNINGS _GENERATED_STDINT_H)
 endif()
 
-target_link_libraries(stringprep Qt5::Core)
+target_link_libraries(stringprep PUBLIC Qt5::Core)
+target_include_directories(stringprep PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3025ebb9..d680eabc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,48 @@
 cmake_minimum_required(VERSION 3.10.0)
-project(iris)
+
+project(iris
+    DESCRIPTION "XMPP network library"
+    LANGUAGES C CXX
+)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-#Sed d prefix for Windows OS debug builds
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
-    set(D "d")
-endif()
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND APPLE)
-    set(D "_debug")
+# Set 'd' prefix for Windows OS debug builds
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    if(WIN32)
+        set(D "d")
+    elseif(APPLE)
+        set(D "_debug")
+    endif()
 endif()
 
-#Check if Iris is subproject
+# Check if Iris is a subproject
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
-set( IRIS_LIB_VERSION_MAJOR 1 )
-set( IRIS_LIB_VERSION_MINOR 0 )
-set( IRIS_LIB_VERSION_PATCH 0 )
-set( IRIS_LIB_VERSION_STRING
+set(IRIS_LIB_VERSION_MAJOR 1)
+set(IRIS_LIB_VERSION_MINOR 0)
+set(IRIS_LIB_VERSION_PATCH 0)
+set(IRIS_LIB_VERSION_STRING
     ${IRIS_LIB_VERSION_MAJOR}.${IRIS_LIB_VERSION_MINOR}.${IRIS_LIB_VERSION_PATCH}
-    )
-
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+)
 
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${ABS_PARENT_DIR}/cmake/modules"
-    "${PROJECT_SOURCE_DIR}/cmake/modules"
-    )
+    "${CMAKE_SOURCE_DIR}/cmake/modules"
+)
 
 include(policyRules)
 
-set( DEFAULT_BUNDLED_QCA OFF )
-
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_CXX_STANDARD 11)
 
 # Detect MXE cross-compilation
+set(IRIS_DEFAULT_BUNDLED_USRSCTP OFF)
 if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
-    option( USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF )
+    option(USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF)
     string(TOLOWER ${CMAKE_TOOLCHAIN_FILE} TOOLCHAIN_FILE)
     string(REGEX MATCH "mxe-conf" MXE_DETECTED "${TOOLCHAIN_FILE}")
     if(MXE_DETECTED)
@@ -47,23 +50,24 @@ if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
         message(STATUS "MXE toolchain: ${CMAKE_TOOLCHAIN_FILE}")
         message(STATUS "MXE root path: ${CMAKE_PREFIX_PATH}")
         set(USE_MXE ON)
-        set(BUNDLED_USRSCTP ON)
+        set(IRIS_DEFAULT_BUNDLED_USRSCTP ON)
     endif()
 endif()
 
-if (APPLE OR (MSVC OR USE_MXE))
-    set( DEFAULT_BUNDLED_QCA ON )
+set(IRIS_DEFAULT_BUNDLED_QCA OFF)
+if(APPLE OR (MSVC OR USE_MXE))
+    set(IRIS_DEFAULT_BUNDLED_QCA ON)
 endif()
 
-option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
-option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
+option(IRIS_ENABLE_INSTALL "Enable installation" OFF)
+option(IRIS_ENABLE_JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON)
+option(IRIS_BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${IRIS_DEFAULT_BUNDLED_QCA})
+option(IRIS_BUNDLED_USRSCTP "Compile compatible UsrSCTP lib (required for datachannel Jingle transport)" ${IRIS_DEFAULT_BUNDLED_USRSCTP})
+option(IRIS_BUILD_TOOLS "Build tools and examples" OFF)
+option(IRIS_ENABLE_DEBUG "Enable debugging code paths" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 
-include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
-include_directories(include/iris)
-
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     include(debug-definitions)
 endif()
@@ -72,16 +76,15 @@ find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
     message(STATUS "Qt5 found, version ${Qt5Core_VERSION}")
-    if(BUNDLED_QCA AND("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
-        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable BUNDLED_QCA option")
+    if(IRIS_BUNDLED_QCA AND ("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
+        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable IRIS_BUNDLED_QCA option")
     endif()
 endif()
 
-#Find QCA package or use bundled if enabled
+# Find QCA package or use bundled if enabled
 include(IrisQCA)
 
 set(STDINT_FOUND OFF)
-
 find_file(STDINT_INCLUDE stdint.h)
 
 if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
@@ -89,27 +92,175 @@ if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
     set(STDINT_FOUND ON)
 endif()
 
-#Find SCTP package or use bundled if enabled
-if(JINGLE_SCTP)
+# Find SCTP package or use bundled if enabled
+if(IRIS_ENABLE_JINGLE_SCTP)
     include(IrisSCTP)
 endif()
 
-
-if (NOT BUNDLED_QCA)
+if(NOT IRIS_BUNDLED_QCA)
     find_package(B2 QUIET)
     if(B2_FOUND)
         message(STATUS "Found B2: ${B2_LIBRARY}")
     endif()
 endif()
 
-add_definitions(-DIRISNET_STATIC -DQSTRINGPREP_BUILDING)
-
 add_subdirectory(3rdparty/stringprep)
 add_subdirectory(src/irisnet)
 add_subdirectory(src/xmpp)
-if(BUILD_IRIS_TOOLS)
+
+if(IRIS_BUILD_TOOLS)
+    if(NOT IRIS_BUNDLED_QCA)
+        message(FATAL_ERROR "Bundled Qca is needed to build tools")
+    endif()
     add_subdirectory(tools)
 endif()
+
 if(NOT IS_SUBPROJECT)
     include(fix-codestyle)
 endif()
+
+if(IRIS_ENABLE_INSTALL)
+    include(CMakePackageConfigHelpers)
+    include(GNUInstallDirs)
+
+    write_basic_package_version_file(
+        ${CMAKE_CURRENT_BINARY_DIR}/IrisConfigVersion.cmake
+        VERSION ${IRIS_LIB_VERSION_STRING}
+        COMPATIBILITY SameMajorVersion
+    )
+    configure_file(
+        iris.pc.in
+        ${CMAKE_CURRENT_BINARY_DIR}/iris.pc
+        @ONLY
+    )
+
+    install(TARGETS iris
+        EXPORT iris
+        LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+    )
+    install(EXPORT iris
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Iris
+        NAMESPACE iris::
+        FILE IrisConfig.cmake
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/IrisConfigVersion.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Iris
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iris.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    )
+
+    set(IRISNET_CORELIB_HEADERS
+        src/irisnet/corelib/addressresolver.h
+        src/irisnet/corelib/irisnetexport.h
+        src/irisnet/corelib/irisnetglobal.h
+        src/irisnet/corelib/irisnetplugin.h
+        src/irisnet/corelib/netavailability.h
+        src/irisnet/corelib/netinterface.h
+        src/irisnet/corelib/netnames.h
+        src/irisnet/corelib/objectsession.h
+    )
+    set(IRISNET_NONCORE_HEADERS
+        src/irisnet/noncore/cutestuff/bsocket.h
+        src/irisnet/noncore/cutestuff/bytestream.h
+        src/irisnet/noncore/cutestuff/httpconnect.h
+        src/irisnet/noncore/cutestuff/httppoll.h
+        src/irisnet/noncore/cutestuff/socks.h
+        src/irisnet/noncore/dtls.h
+        src/irisnet/noncore/ice176.h
+        src/irisnet/noncore/iceabstractstundisco.h
+        src/irisnet/noncore/iceagent.h
+        src/irisnet/noncore/legacy/ndns.h
+        src/irisnet/noncore/legacy/srvresolver.h
+        src/irisnet/noncore/processquit.h
+        src/irisnet/noncore/stunallocate.h
+        src/irisnet/noncore/stunbinding.h
+        src/irisnet/noncore/stunmessage.h
+        src/irisnet/noncore/stuntransaction.h
+        src/irisnet/noncore/tcpportreserver.h
+        src/irisnet/noncore/turnclient.h
+        src/irisnet/noncore/udpportreserver.h
+    )
+    set(XMPP_JID_HEADERS
+        src/xmpp/jid/jid.h
+    )
+    set(XMPP_CORE_HEADERS
+        src/xmpp/xmpp-core/xmpp.h
+        src/xmpp/xmpp-core/xmpp_clientstream.h
+        src/xmpp/xmpp-core/xmpp_stanza.h
+        src/xmpp/xmpp-core/xmpp_stream.h
+    )
+    set(XMPP_IM_HEADERS
+        src/xmpp/xmpp-im/filetransfer.h
+        src/xmpp/xmpp-im/httpfileupload.h
+        src/xmpp/xmpp-im/im.h
+        src/xmpp/xmpp-im/jingle-application.h
+        src/xmpp/xmpp-im/jingle-ft.h
+        src/xmpp/xmpp-im/jingle-ice.h
+        src/xmpp/xmpp-im/jingle-nstransportslist.h
+        src/xmpp/xmpp-im/jingle-s5b.h
+        src/xmpp/xmpp-im/jingle-session.h
+        src/xmpp/xmpp-im/jingle-transport.h
+        src/xmpp/xmpp-im/jingle.h
+        src/xmpp/xmpp-im/s5b.h
+        src/xmpp/xmpp-im/xmpp_address.h
+        src/xmpp/xmpp-im/xmpp_agentitem.h
+        src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+        src/xmpp/xmpp-im/xmpp_caps.h
+        src/xmpp/xmpp-im/xmpp_captcha.h
+        src/xmpp/xmpp-im/xmpp_chatstate.h
+        src/xmpp/xmpp-im/xmpp_client.h
+        src/xmpp/xmpp-im/xmpp_discoinfotask.h
+        src/xmpp/xmpp-im/xmpp_discoitem.h
+        src/xmpp/xmpp-im/xmpp_encryption.h
+        src/xmpp/xmpp-im/xmpp_encryptionhandler.h
+        src/xmpp/xmpp-im/xmpp_features.h
+        src/xmpp/xmpp-im/xmpp_hash.h
+        src/xmpp/xmpp-im/xmpp_htmlelement.h
+        src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+        src/xmpp/xmpp-im/xmpp_liveroster.h
+        src/xmpp/xmpp-im/xmpp_liverosteritem.h
+        src/xmpp/xmpp-im/xmpp_message.h
+        src/xmpp/xmpp-im/xmpp_muc.h
+        src/xmpp/xmpp-im/xmpp_pubsubitem.h
+        src/xmpp/xmpp-im/xmpp_pubsubretraction.h
+        src/xmpp/xmpp-im/xmpp_reference.h
+        src/xmpp/xmpp-im/xmpp_resource.h
+        src/xmpp/xmpp-im/xmpp_resourcelist.h
+        src/xmpp/xmpp-im/xmpp_roster.h
+        src/xmpp/xmpp-im/xmpp_rosteritem.h
+        src/xmpp/xmpp-im/xmpp_rosterx.h
+        src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+        src/xmpp/xmpp-im/xmpp_status.h
+        src/xmpp/xmpp-im/xmpp_subsets.h
+        src/xmpp/xmpp-im/xmpp_task.h
+        src/xmpp/xmpp-im/xmpp_tasks.h
+        src/xmpp/xmpp-im/xmpp_thumbs.h
+        src/xmpp/xmpp-im/xmpp_url.h
+        src/xmpp/xmpp-im/xmpp_vcard.h
+        src/xmpp/xmpp-im/xmpp_xdata.h
+        src/xmpp/xmpp-im/xmpp_xmlcommon.h
+    )
+
+    set(IRIS_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/xmpp/iris)
+    install(FILES ${IRISNET_CORELIB_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/corelib
+    )
+    install(FILES ${IRISNET_NONCORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/noncore
+    )
+    install(FILES ${XMPP_JID_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/jid
+    )
+    install(FILES ${XMPP_CORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-core
+    )
+    install(FILES ${XMPP_IM_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-im
+    )
+    install(DIRECTORY include/iris
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xmpp
+        FILES_MATCHING PATTERN "*.h"
+    )
+endif()
diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
index 42787c33..4b87e45b 100644
--- a/cmake/modules/IrisQCA.cmake
+++ b/cmake/modules/IrisQCA.cmake
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.0)
 
 set(IrisQCAGitRepo "https://github.com/psi-im/qca.git")
 
-if(BUNDLED_QCA)
+if(IRIS_BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
@@ -66,14 +66,7 @@ if(BUNDLED_QCA)
             )
     endif()
 else()
-    message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
+    message(WARNING "Disabling IRIS_BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
     message(STATUS "QCA: using system")
     find_package(Qca REQUIRED)
 endif()
-
-set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
-set(qca_LIB ${Qca_LIBRARY})
-
-include_directories(
-    ${Qca_INCLUDE_DIR}
-)
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index 54e8b1c8..42226968 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -1,23 +1,18 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-include(CMakeDependentOption)
-cmake_dependent_option( BUNDLED_USRSCTP
-    "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
-    OFF "JINGLE_SCTP" OFF)
-
 set(IrisSCTPGitRepo "https://github.com/sctplab/usrsctp.git")
 
 if(USE_MXE AND STDINT_FOUND)
-    #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
+    # Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
     add_definitions(
         -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"
     )
 endif()
 
-if(NOT BUNDLED_USRSCTP)
+if(NOT IRIS_BUNDLED_USRSCTP)
     find_package(UsrSCTP)
-    if (NOT UsrSCTP_FOUND)
-        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
+    if(NOT UsrSCTP_FOUND)
+        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable IRIS_BUNDLED_USRSCTP flag")
     endif()
 else()
     message(STATUS "USRSCTP: using bundled")
@@ -25,9 +20,9 @@ else()
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
     set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
     if(NOT EXISTS ${USRSCTP_SOURCE_DIR})
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
+        set(USRSCTP_INCLUDES ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
     else()
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
+        set(USRSCTP_INCLUDES ${USRSCTP_SOURCE_DIR}/usrsctplib)
     endif()
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
     if(WIN32 AND MSVC)
@@ -78,14 +73,3 @@ else()
             IMPORTED_LINK_INTERFACE_LANGUAGES "C")
     add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
 endif()
-
-set(sctpLab_LIBRARY ${USRSCTP_LIBRARY})
-if(USRSCTP_INCLUDES)
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDES})
-else()
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDE_DIR})
-endif()
-include_directories(
-    ${sctpLab_INCLUDES}
-)
-add_definitions(-DJINGLE_SCTP)
diff --git a/include/iris/addressresolver.h b/include/iris/addressresolver.h
index 4e7e4455..6d771ec4 100644
--- a/include/iris/addressresolver.h
+++ b/include/iris/addressresolver.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/addressresolver.h"
+#include "irisnet/corelib/addressresolver.h"
diff --git a/include/iris/bsocket.h b/include/iris/bsocket.h
index 5c7c906d..dc480185 100644
--- a/include/iris/bsocket.h
+++ b/include/iris/bsocket.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/bsocket.h"
+#include "irisnet/noncore/cutestuff/bsocket.h"
diff --git a/include/iris/bytestream.h b/include/iris/bytestream.h
index cae0e2e9..5d276979 100644
--- a/include/iris/bytestream.h
+++ b/include/iris/bytestream.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/bytestream.h"
+#include "irisnet/noncore/cutestuff/bytestream.h"
diff --git a/include/iris/dtls.h b/include/iris/dtls.h
index 02d353d7..7bfafddc 100644
--- a/include/iris/dtls.h
+++ b/include/iris/dtls.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/dtls.h"
+#include "irisnet/noncore/dtls.h"
diff --git a/include/iris/filetransfer.h b/include/iris/filetransfer.h
index e17e8ab0..c9e5d59d 100644
--- a/include/iris/filetransfer.h
+++ b/include/iris/filetransfer.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/filetransfer.h"
+#include "xmpp/xmpp-im/filetransfer.h"
diff --git a/include/iris/httpconnect.h b/include/iris/httpconnect.h
index 91306af6..b0840552 100644
--- a/include/iris/httpconnect.h
+++ b/include/iris/httpconnect.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/httpconnect.h"
+#include "irisnet/noncore/cutestuff/httpconnect.h"
diff --git a/include/iris/httpfileupload.h b/include/iris/httpfileupload.h
index 381b857d..efe0bb11 100644
--- a/include/iris/httpfileupload.h
+++ b/include/iris/httpfileupload.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/httpfileupload.h"
+#include "xmpp/xmpp-im/httpfileupload.h"
diff --git a/include/iris/httppoll.h b/include/iris/httppoll.h
index 5ac52eb5..162d67c0 100644
--- a/include/iris/httppoll.h
+++ b/include/iris/httppoll.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/httppoll.h"
+#include "irisnet/noncore/cutestuff/httppoll.h"
diff --git a/include/iris/ice176.h b/include/iris/ice176.h
index 5a6360a5..adc42e8c 100644
--- a/include/iris/ice176.h
+++ b/include/iris/ice176.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/ice176.h"
+#include "irisnet/noncore/ice176.h"
diff --git a/include/iris/iceabstractstundisco.h b/include/iris/iceabstractstundisco.h
index e1ff2fd5..9f3f6a8a 100644
--- a/include/iris/iceabstractstundisco.h
+++ b/include/iris/iceabstractstundisco.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/iceabstractstundisco.h"
+#include "irisnet/noncore/iceabstractstundisco.h"
diff --git a/include/iris/iceagent.h b/include/iris/iceagent.h
index 61b9e68e..c8739eda 100644
--- a/include/iris/iceagent.h
+++ b/include/iris/iceagent.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/iceagent.h"
+#include "irisnet/noncore/iceagent.h"
diff --git a/include/iris/im.h b/include/iris/im.h
index beb8c104..ee83ff9a 100644
--- a/include/iris/im.h
+++ b/include/iris/im.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/im.h"
+#include "xmpp/xmpp-im/im.h"
diff --git a/include/iris/irisnetexport.h b/include/iris/irisnetexport.h
index d169d1ed..9cb9d147 100644
--- a/include/iris/irisnetexport.h
+++ b/include/iris/irisnetexport.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetexport.h"
+#include "irisnet/corelib/irisnetexport.h"
diff --git a/include/iris/irisnetglobal.h b/include/iris/irisnetglobal.h
index 28a55c73..552439d9 100644
--- a/include/iris/irisnetglobal.h
+++ b/include/iris/irisnetglobal.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetglobal.h"
+#include "irisnet/corelib/irisnetglobal.h"
diff --git a/include/iris/irisnetplugin.h b/include/iris/irisnetplugin.h
index 2d4b0a3a..86d21917 100644
--- a/include/iris/irisnetplugin.h
+++ b/include/iris/irisnetplugin.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetplugin.h"
+#include "irisnet/corelib/irisnetplugin.h"
diff --git a/include/iris/jingle-application.h b/include/iris/jingle-application.h
index adab289d..754225c1 100644
--- a/include/iris/jingle-application.h
+++ b/include/iris/jingle-application.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-application.h"
+#include "xmpp/xmpp-im/jingle-application.h"
diff --git a/include/iris/jingle-ft.h b/include/iris/jingle-ft.h
index a9880b3f..7caced0e 100644
--- a/include/iris/jingle-ft.h
+++ b/include/iris/jingle-ft.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-ft.h"
+#include "xmpp/xmpp-im/jingle-ft.h"
diff --git a/include/iris/jingle-ice.h b/include/iris/jingle-ice.h
index 98b263fb..6dd3e033 100644
--- a/include/iris/jingle-ice.h
+++ b/include/iris/jingle-ice.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-ice.h"
+#include "xmpp/xmpp-im/jingle-ice.h"
diff --git a/include/iris/jingle-nstransportslist.h b/include/iris/jingle-nstransportslist.h
index affbfd0e..a1f36859 100644
--- a/include/iris/jingle-nstransportslist.h
+++ b/include/iris/jingle-nstransportslist.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-nstransportslist.h"
+#include "xmpp/xmpp-im/jingle-nstransportslist.h"
diff --git a/include/iris/jingle-s5b.h b/include/iris/jingle-s5b.h
index 725e0a05..b34fceea 100644
--- a/include/iris/jingle-s5b.h
+++ b/include/iris/jingle-s5b.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-s5b.h"
+#include "xmpp/xmpp-im/jingle-s5b.h"
diff --git a/include/iris/jingle-session.h b/include/iris/jingle-session.h
index 78248dcf..d8c14eea 100644
--- a/include/iris/jingle-session.h
+++ b/include/iris/jingle-session.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-session.h"
+#include "xmpp/xmpp-im/jingle-session.h"
diff --git a/include/iris/jingle-transport.h b/include/iris/jingle-transport.h
index b83eb5a4..6898bd68 100644
--- a/include/iris/jingle-transport.h
+++ b/include/iris/jingle-transport.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-transport.h"
+#include "xmpp/xmpp-im/jingle-transport.h"
diff --git a/include/iris/jingle.h b/include/iris/jingle.h
index 73551781..c4d32a97 100644
--- a/include/iris/jingle.h
+++ b/include/iris/jingle.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle.h"
+#include "xmpp/xmpp-im/jingle.h"
diff --git a/include/iris/ndns.h b/include/iris/ndns.h
index ea5c8b5f..9c270bba 100644
--- a/include/iris/ndns.h
+++ b/include/iris/ndns.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/legacy/ndns.h"
+#include "irisnet/noncore/legacy/ndns.h"
diff --git a/include/iris/netavailability.h b/include/iris/netavailability.h
index 11ef9114..8079c5f6 100644
--- a/include/iris/netavailability.h
+++ b/include/iris/netavailability.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netavailability.h"
+#include "irisnet/corelib/netavailability.h"
diff --git a/include/iris/netinterface.h b/include/iris/netinterface.h
index 6e0e2333..4d95300d 100644
--- a/include/iris/netinterface.h
+++ b/include/iris/netinterface.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netinterface.h"
+#include "irisnet/corelib/netinterface.h"
diff --git a/include/iris/netnames.h b/include/iris/netnames.h
index 5ac6a1ee..804950ca 100644
--- a/include/iris/netnames.h
+++ b/include/iris/netnames.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netnames.h"
+#include "irisnet/corelib/netnames.h"
diff --git a/include/iris/objectsession.h b/include/iris/objectsession.h
index 31bb9009..e98bef86 100644
--- a/include/iris/objectsession.h
+++ b/include/iris/objectsession.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/objectsession.h"
+#include "irisnet/corelib/objectsession.h"
diff --git a/include/iris/processquit.h b/include/iris/processquit.h
index 0f39f170..c92f192f 100644
--- a/include/iris/processquit.h
+++ b/include/iris/processquit.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/processquit.h"
+#include "irisnet/noncore/processquit.h"
diff --git a/include/iris/s5b.h b/include/iris/s5b.h
index 6658c494..d868c241 100644
--- a/include/iris/s5b.h
+++ b/include/iris/s5b.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/s5b.h"
+#include "xmpp/xmpp-im/s5b.h"
diff --git a/include/iris/socks.h b/include/iris/socks.h
index ff5108ab..08cdb678 100644
--- a/include/iris/socks.h
+++ b/include/iris/socks.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/socks.h"
+#include "irisnet/noncore/cutestuff/socks.h"
diff --git a/include/iris/srvresolver.h b/include/iris/srvresolver.h
index 7ece1aba..13ea4671 100644
--- a/include/iris/srvresolver.h
+++ b/include/iris/srvresolver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/legacy/srvresolver.h"
+#include "irisnet/noncore/legacy/srvresolver.h"
diff --git a/include/iris/stunallocate.h b/include/iris/stunallocate.h
index a1c9a746..4b5d7aa6 100644
--- a/include/iris/stunallocate.h
+++ b/include/iris/stunallocate.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunallocate.h"
+#include "irisnet/noncore/stunallocate.h"
diff --git a/include/iris/stunbinding.h b/include/iris/stunbinding.h
index 86f92df1..5370cc52 100644
--- a/include/iris/stunbinding.h
+++ b/include/iris/stunbinding.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunbinding.h"
+#include "irisnet/noncore/stunbinding.h"
diff --git a/include/iris/stunmessage.h b/include/iris/stunmessage.h
index 6025e7b8..40ac0d7c 100644
--- a/include/iris/stunmessage.h
+++ b/include/iris/stunmessage.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunmessage.h"
+#include "irisnet/noncore/stunmessage.h"
diff --git a/include/iris/stuntransaction.h b/include/iris/stuntransaction.h
index 05d65576..fef1831c 100644
--- a/include/iris/stuntransaction.h
+++ b/include/iris/stuntransaction.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stuntransaction.h"
+#include "irisnet/noncore/stuntransaction.h"
diff --git a/include/iris/tcpportreserver.h b/include/iris/tcpportreserver.h
index ed0f9a46..5fa38181 100644
--- a/include/iris/tcpportreserver.h
+++ b/include/iris/tcpportreserver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/tcpportreserver.h"
+#include "irisnet/noncore/tcpportreserver.h"
diff --git a/include/iris/turnclient.h b/include/iris/turnclient.h
index 07de0434..1edf8d39 100644
--- a/include/iris/turnclient.h
+++ b/include/iris/turnclient.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/turnclient.h"
+#include "irisnet/noncore/turnclient.h"
diff --git a/include/iris/udpportreserver.h b/include/iris/udpportreserver.h
index d7e93233..50101a1e 100644
--- a/include/iris/udpportreserver.h
+++ b/include/iris/udpportreserver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/udpportreserver.h"
+#include "irisnet/noncore/udpportreserver.h"
diff --git a/include/iris/xmpp.h b/include/iris/xmpp.h
index cbeb4bab..1ced3d12 100644
--- a/include/iris/xmpp.h
+++ b/include/iris/xmpp.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp.h"
+#include "xmpp/xmpp-core/xmpp.h"
diff --git a/include/iris/xmpp_address.h b/include/iris/xmpp_address.h
index a6b8a669..2d87c6db 100644
--- a/include/iris/xmpp_address.h
+++ b/include/iris/xmpp_address.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_address.h"
+#include "xmpp/xmpp-im/xmpp_address.h"
diff --git a/include/iris/xmpp_agentitem.h b/include/iris/xmpp_agentitem.h
index 4ac1d4ee..fd477af0 100644
--- a/include/iris/xmpp_agentitem.h
+++ b/include/iris/xmpp_agentitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_agentitem.h"
+#include "xmpp/xmpp-im/xmpp_agentitem.h"
diff --git a/include/iris/xmpp_bitsofbinary.h b/include/iris/xmpp_bitsofbinary.h
index 01b1bf8d..011ebf4a 100644
--- a/include/iris/xmpp_bitsofbinary.h
+++ b/include/iris/xmpp_bitsofbinary.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_bitsofbinary.h"
+#include "xmpp/xmpp-im/xmpp_bitsofbinary.h"
diff --git a/include/iris/xmpp_caps.h b/include/iris/xmpp_caps.h
index 4dde12ab..7b758b41 100644
--- a/include/iris/xmpp_caps.h
+++ b/include/iris/xmpp_caps.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_caps.h"
+#include "xmpp/xmpp-im/xmpp_caps.h"
diff --git a/include/iris/xmpp_captcha.h b/include/iris/xmpp_captcha.h
index 466b4315..1a00797f 100644
--- a/include/iris/xmpp_captcha.h
+++ b/include/iris/xmpp_captcha.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_captcha.h"
+#include "xmpp/xmpp-im/xmpp_captcha.h"
diff --git a/include/iris/xmpp_chatstate.h b/include/iris/xmpp_chatstate.h
index a09c9cc6..a4c29fa2 100644
--- a/include/iris/xmpp_chatstate.h
+++ b/include/iris/xmpp_chatstate.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_chatstate.h"
+#include "xmpp/xmpp-im/xmpp_chatstate.h"
diff --git a/include/iris/xmpp_client.h b/include/iris/xmpp_client.h
index 8d7b1ac7..44c3397f 100644
--- a/include/iris/xmpp_client.h
+++ b/include/iris/xmpp_client.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_client.h"
+#include "xmpp/xmpp-im/xmpp_client.h"
diff --git a/include/iris/xmpp_clientstream.h b/include/iris/xmpp_clientstream.h
index 090f8548..6f2054ba 100644
--- a/include/iris/xmpp_clientstream.h
+++ b/include/iris/xmpp_clientstream.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_clientstream.h"
+#include "xmpp/xmpp-core/xmpp_clientstream.h"
diff --git a/include/iris/xmpp_discoinfotask.h b/include/iris/xmpp_discoinfotask.h
index 2e06c7be..38410b48 100644
--- a/include/iris/xmpp_discoinfotask.h
+++ b/include/iris/xmpp_discoinfotask.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_discoinfotask.h"
+#include "xmpp/xmpp-im/xmpp_discoinfotask.h"
diff --git a/include/iris/xmpp_discoitem.h b/include/iris/xmpp_discoitem.h
index 76c777f2..4e7a1fa1 100644
--- a/include/iris/xmpp_discoitem.h
+++ b/include/iris/xmpp_discoitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_discoitem.h"
+#include "xmpp/xmpp-im/xmpp_discoitem.h"
diff --git a/include/iris/xmpp_encryption.h b/include/iris/xmpp_encryption.h
index 5b3a05f5..895f43b1 100644
--- a/include/iris/xmpp_encryption.h
+++ b/include/iris/xmpp_encryption.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_encryption.h"
+#include "xmpp/xmpp-im/xmpp_encryption.h"
diff --git a/include/iris/xmpp_encryptionhandler.h b/include/iris/xmpp_encryptionhandler.h
index 26e56549..3c7aecd9 100644
--- a/include/iris/xmpp_encryptionhandler.h
+++ b/include/iris/xmpp_encryptionhandler.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_encryptionhandler.h"
+#include "xmpp/xmpp-im/xmpp_encryptionhandler.h"
diff --git a/include/iris/xmpp_features.h b/include/iris/xmpp_features.h
index caf6865d..2a06625a 100644
--- a/include/iris/xmpp_features.h
+++ b/include/iris/xmpp_features.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_features.h"
+#include "xmpp/xmpp-im/xmpp_features.h"
diff --git a/include/iris/xmpp_hash.h b/include/iris/xmpp_hash.h
index b27bbbd1..dc081bed 100644
--- a/include/iris/xmpp_hash.h
+++ b/include/iris/xmpp_hash.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_hash.h"
+#include "xmpp/xmpp-im/xmpp_hash.h"
diff --git a/include/iris/xmpp_htmlelement.h b/include/iris/xmpp_htmlelement.h
index 95bab250..fdf91719 100644
--- a/include/iris/xmpp_htmlelement.h
+++ b/include/iris/xmpp_htmlelement.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_htmlelement.h"
+#include "xmpp/xmpp-im/xmpp_htmlelement.h"
diff --git a/include/iris/xmpp_httpauthrequest.h b/include/iris/xmpp_httpauthrequest.h
index bec230e9..63646a1e 100644
--- a/include/iris/xmpp_httpauthrequest.h
+++ b/include/iris/xmpp_httpauthrequest.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_httpauthrequest.h"
+#include "xmpp/xmpp-im/xmpp_httpauthrequest.h"
diff --git a/include/iris/xmpp_jid.h b/include/iris/xmpp_jid.h
index bdb862da..94dc48d7 100644
--- a/include/iris/xmpp_jid.h
+++ b/include/iris/xmpp_jid.h
@@ -1 +1 @@
-#include "../../src/xmpp/jid/jid.h"
+#include "xmpp/jid/jid.h"
diff --git a/include/iris/xmpp_liveroster.h b/include/iris/xmpp_liveroster.h
index ab67fcbc..bab57092 100644
--- a/include/iris/xmpp_liveroster.h
+++ b/include/iris/xmpp_liveroster.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_liveroster.h"
+#include "xmpp/xmpp-im/xmpp_liveroster.h"
diff --git a/include/iris/xmpp_liverosteritem.h b/include/iris/xmpp_liverosteritem.h
index db5c2488..1a2efc15 100644
--- a/include/iris/xmpp_liverosteritem.h
+++ b/include/iris/xmpp_liverosteritem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_liverosteritem.h"
+#include "xmpp/xmpp-im/xmpp_liverosteritem.h"
diff --git a/include/iris/xmpp_message.h b/include/iris/xmpp_message.h
index a75e34fa..29428d99 100644
--- a/include/iris/xmpp_message.h
+++ b/include/iris/xmpp_message.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_message.h"
+#include "xmpp/xmpp-im/xmpp_message.h"
diff --git a/include/iris/xmpp_muc.h b/include/iris/xmpp_muc.h
index 6f6fe741..6f0ae4d4 100644
--- a/include/iris/xmpp_muc.h
+++ b/include/iris/xmpp_muc.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_muc.h"
+#include "xmpp/xmpp-im/xmpp_muc.h"
diff --git a/include/iris/xmpp_pubsubitem.h b/include/iris/xmpp_pubsubitem.h
index 59f19b3b..780bff84 100644
--- a/include/iris/xmpp_pubsubitem.h
+++ b/include/iris/xmpp_pubsubitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_pubsubitem.h"
+#include "xmpp/xmpp-im/xmpp_pubsubitem.h"
diff --git a/include/iris/xmpp_pubsubretraction.h b/include/iris/xmpp_pubsubretraction.h
index d89799d4..49151f85 100644
--- a/include/iris/xmpp_pubsubretraction.h
+++ b/include/iris/xmpp_pubsubretraction.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_pubsubretraction.h"
+#include "xmpp/xmpp-im/xmpp_pubsubretraction.h"
diff --git a/include/iris/xmpp_reference.h b/include/iris/xmpp_reference.h
index 0dee0eae..fa00c922 100644
--- a/include/iris/xmpp_reference.h
+++ b/include/iris/xmpp_reference.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_reference.h"
+#include "xmpp/xmpp-im/xmpp_reference.h"
diff --git a/include/iris/xmpp_resource.h b/include/iris/xmpp_resource.h
index 2f5a9979..b0867cf5 100644
--- a/include/iris/xmpp_resource.h
+++ b/include/iris/xmpp_resource.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_resource.h"
+#include "xmpp/xmpp-im/xmpp_resource.h"
diff --git a/include/iris/xmpp_resourcelist.h b/include/iris/xmpp_resourcelist.h
index 5771cdd1..27f5d3ad 100644
--- a/include/iris/xmpp_resourcelist.h
+++ b/include/iris/xmpp_resourcelist.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_resourcelist.h"
+#include "xmpp/xmpp-im/xmpp_resourcelist.h"
diff --git a/include/iris/xmpp_roster.h b/include/iris/xmpp_roster.h
index 646f2970..27c9b32c 100644
--- a/include/iris/xmpp_roster.h
+++ b/include/iris/xmpp_roster.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_roster.h"
+#include "xmpp/xmpp-im/xmpp_roster.h"
diff --git a/include/iris/xmpp_rosteritem.h b/include/iris/xmpp_rosteritem.h
index f4d4cf7b..94c9d809 100644
--- a/include/iris/xmpp_rosteritem.h
+++ b/include/iris/xmpp_rosteritem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_rosteritem.h"
+#include "xmpp/xmpp-im/xmpp_rosteritem.h"
diff --git a/include/iris/xmpp_rosterx.h b/include/iris/xmpp_rosterx.h
index 325b56a6..2d7a9728 100644
--- a/include/iris/xmpp_rosterx.h
+++ b/include/iris/xmpp_rosterx.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_rosterx.h"
+#include "xmpp/xmpp-im/xmpp_rosterx.h"
diff --git a/include/iris/xmpp_serverinfomanager.h b/include/iris/xmpp_serverinfomanager.h
index dd79d801..8c5d7f86 100644
--- a/include/iris/xmpp_serverinfomanager.h
+++ b/include/iris/xmpp_serverinfomanager.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_serverinfomanager.h"
+#include "xmpp/xmpp-im/xmpp_serverinfomanager.h"
diff --git a/include/iris/xmpp_stanza.h b/include/iris/xmpp_stanza.h
index 4f0b024d..e8cb64f7 100644
--- a/include/iris/xmpp_stanza.h
+++ b/include/iris/xmpp_stanza.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_stanza.h"
+#include "xmpp/xmpp-core/xmpp_stanza.h"
diff --git a/include/iris/xmpp_status.h b/include/iris/xmpp_status.h
index 69511013..2c923b42 100644
--- a/include/iris/xmpp_status.h
+++ b/include/iris/xmpp_status.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_status.h"
+#include "xmpp/xmpp-im/xmpp_status.h"
diff --git a/include/iris/xmpp_stream.h b/include/iris/xmpp_stream.h
index 5c996666..5ce83e84 100644
--- a/include/iris/xmpp_stream.h
+++ b/include/iris/xmpp_stream.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_stream.h"
+#include "xmpp/xmpp-core/xmpp_stream.h"
diff --git a/include/iris/xmpp_subsets.h b/include/iris/xmpp_subsets.h
index be99daa2..5b54bed1 100644
--- a/include/iris/xmpp_subsets.h
+++ b/include/iris/xmpp_subsets.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_subsets.h"
+#include "xmpp/xmpp-im/xmpp_subsets.h"
diff --git a/include/iris/xmpp_task.h b/include/iris/xmpp_task.h
index 0f8f4667..ac65e099 100644
--- a/include/iris/xmpp_task.h
+++ b/include/iris/xmpp_task.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_task.h"
+#include "xmpp/xmpp-im/xmpp_task.h"
diff --git a/include/iris/xmpp_tasks.h b/include/iris/xmpp_tasks.h
index 6cb81815..0dc03e84 100644
--- a/include/iris/xmpp_tasks.h
+++ b/include/iris/xmpp_tasks.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_tasks.h"
+#include "xmpp/xmpp-im/xmpp_tasks.h"
diff --git a/include/iris/xmpp_thumbs.h b/include/iris/xmpp_thumbs.h
index b24861a0..7715981f 100644
--- a/include/iris/xmpp_thumbs.h
+++ b/include/iris/xmpp_thumbs.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_thumbs.h"
+#include "xmpp/xmpp-im/xmpp_thumbs.h"
diff --git a/include/iris/xmpp_url.h b/include/iris/xmpp_url.h
index 16b3ac6a..674eb76d 100644
--- a/include/iris/xmpp_url.h
+++ b/include/iris/xmpp_url.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_url.h"
+#include "xmpp/xmpp-im/xmpp_url.h"
diff --git a/include/iris/xmpp_vcard.h b/include/iris/xmpp_vcard.h
index 285e6b5c..1210fdb3 100644
--- a/include/iris/xmpp_vcard.h
+++ b/include/iris/xmpp_vcard.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_vcard.h"
+#include "xmpp/xmpp-im/xmpp_vcard.h"
diff --git a/include/iris/xmpp_xdata.h b/include/iris/xmpp_xdata.h
index 417e71f7..8316f4c9 100644
--- a/include/iris/xmpp_xdata.h
+++ b/include/iris/xmpp_xdata.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_xdata.h"
+#include "xmpp/xmpp-im/xmpp_xdata.h"
diff --git a/include/iris/xmpp_xmlcommon.h b/include/iris/xmpp_xmlcommon.h
index 779b4b59..2c0d42c0 100644
--- a/include/iris/xmpp_xmlcommon.h
+++ b/include/iris/xmpp_xmlcommon.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_xmlcommon.h"
+#include "xmpp/xmpp-im/xmpp_xmlcommon.h"
diff --git a/iris.pc.in b/iris.pc.in
index 676104d0..68f1faaa 100644
--- a/iris.pc.in
+++ b/iris.pc.in
@@ -1,10 +1,10 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@/iris
+prefix="@CMAKE_INSTALL_PREFIX@"
+exec_prefix="${prefix}"
+libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/xmpp"
 
 Name: iris
 Description: Iris is a comprehensive library for working with the XMPP protocol
-Version: @IRIS_LIB_MAJOR_VERSION@.@IRIS_LIB_MINOR_VERSION@.@IRIS_LIB_PATCH_VERSION@
+Version: @IRIS_LIB_VERSION_STRING@
 Libs: -L${libdir} -liris
 Cflags: -I${includedir}
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 54a383b2..3d3a1aa0 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -1,21 +1,13 @@
 cmake_minimum_required(VERSION 3.10.0)
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    corelib
-    noncore
-    noncore/cutestuff
-    noncore/legacy
-    ${QCA_INCLUDES}
-    ${sctpLab_INCLUDES}
-)
 
 list(APPEND CMAKE_MODULE_PATH
+    "${CMAKE_SOURCE_DIR}/cmake/modules"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${ABS_PARENT_DIR}/cmake/modules"
 )
 
-set(SOURCES
+add_library(irisnet STATIC)
+
+target_sources(irisnet PRIVATE
     corelib/irisnetglobal.cpp
     corelib/irisnetplugin.cpp
 
@@ -58,88 +50,48 @@ set(SOURCES
 )
 
 if(UNIX)
-    list(APPEND SOURCES corelib/netinterface_unix.cpp)
+    target_sources(irisnet PRIVATE
+        corelib/netinterface_unix.cpp
+    )
 endif()
 
-set(HEADERS
-    corelib/irisnetexport.h
-    corelib/irisnetglobal.h
-    corelib/irisnetglobal_p.h
-
-    noncore/stunmessage.h
-    noncore/stuntypes.h
-    noncore/stunutil.h
-
-    corelib/addressresolver.h
-    corelib/irisnetplugin.h
-    corelib/netavailability.h
-    corelib/netinterface.h
-    corelib/netnames.h
-    corelib/objectsession.h
-
-    noncore/iceagent.h
-    noncore/ice176.h
-    noncore/icecomponent.h
-    noncore/icelocaltransport.h
-    noncore/icetransport.h
-    noncore/iceturntransport.h
-    noncore/processquit.h
-    noncore/stunallocate.h
-    noncore/stunbinding.h
-    noncore/stuntransaction.h
-    noncore/turnclient.h
-    noncore/udpportreserver.h
-    noncore/tcpportreserver.h
-    noncore/dtls.h
-    noncore/iceabstractstundisco.h
-
-    noncore/cutestuff/bsocket.h
-    noncore/cutestuff/bytestream.h
-    noncore/cutestuff/httpconnect.h
-    noncore/cutestuff/httppoll.h
-    noncore/cutestuff/socks.h
-
-    noncore/legacy/ndns.h
-    noncore/legacy/srvresolver.h
-    noncore/transportaddress.h
-)
-
-if(JINGLE_SCTP)
-    list(APPEND SOURCES
+if(IRIS_ENABLE_JINGLE_SCTP)
+    target_sources(irisnet PRIVATE
         noncore/sctp/SctpAssociation.cpp
         noncore/sctp/DepUsrSCTP.cpp
-        )
-
-    list(APPEND HEADERS
-        noncore/sctp/Logger.hpp
-        noncore/sctp/SctpAssociation.hpp
-        noncore/sctp/DepUsrSCTP.hpp
-        noncore/sctp/RTC/DataConsumer.hpp
-        noncore/sctp/RTC/DataProducer.hpp
-        noncore/sctp/RTC/SctpParameters.hpp
-        )
+    )
 endif()
 
-add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
+if(IRIS_BUNDLED_QCA)
+    add_dependencies(irisnet QcaProject)
+endif()
 
-if(WIN32)
-    set(EXTRA_LDFLAGS ws2_32 iphlpapi)
+if(IRIS_ENABLE_JINGLE_SCTP AND IRIS_BUNDLED_USRSCTP)
+    add_dependencies(irisnet UsrSCTPProject)
 endif()
 
+target_include_directories(irisnet
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/include/iris
+        ${CMAKE_SOURCE_DIR}/src
+        ${Qca_INCLUDE_DIR}
+    PUBLIC
+        ${USRSCTP_INCLUDES}
+)
+
 target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
-target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
-if (BUNDLED_QCA)
-    add_dependencies(irisnet QcaProject)
-endif()
-if (BUNDLED_USRSCTP)
-    add_dependencies(irisnet UsrSCTPProject)
+
+if(WIN32)
+    target_link_libraries(irisnet PUBLIC ws2_32 iphlpapi)
 endif()
-target_link_libraries(irisnet ${qca_LIB})
-target_link_libraries(irisnet ${sctpLab_LIBRARY})
-target_link_libraries(irisnet ${EXTRA_LDFLAGS})
 
-# usrsctp requires pthread
+# UsrSCTP requires pthread
 if(NOT WIN32)
     find_package(Threads)
-    target_link_libraries(irisnet Threads::Threads)
+    target_link_libraries(irisnet PUBLIC Threads::Threads)
 endif()
+
+target_link_libraries(irisnet PUBLIC
+    ${Qca_LIBRARY} ${USRSCTP_LIBRARY}
+    Qt5::Core Qt5::Network Qt5::Xml
+)
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 11461560..433a40df 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 namespace XMPP {
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 5fb449c2..860e6d6b 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -18,7 +18,7 @@
 
 #include "netinterface.h"
 
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 #include <QDebug>
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index e12f3c57..adbf1b8a 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -20,7 +20,7 @@
 #include "netnames.h"
 
 #include "addressresolver.h"
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index b6aa42a8..f30d2a73 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -19,7 +19,7 @@
 #include "processquit.h"
 
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #endif
 
 #ifdef QT_GUI_LIB
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 1250fccc..90ab90fc 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,115 +1,10 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-add_definitions(-DXMPP_TEST)
-
 find_package(ZLIB REQUIRED)
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-get_filename_component(ABS_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${ABS_PARENT_DIR}
-    ${ABS_PARENT_DIR}/irisnet/corelib
-    xmpp-core
-    xmpp-im
-    ${ZLIB_INCLUDE_DIRS}
-    ${QCA_INCLUDES}
-    )
 
-set(HEADERS
-    xmpp-core/parser.h
-    xmpp-core/protocol.h
-    xmpp-core/sm.h
-    xmpp-core/td.h
-    xmpp-core/xmlprotocol.h
-    xmpp-core/xmpp_stanza.h
-
-    xmpp-im/xmpp_address.h
-    xmpp-im/xmpp_hash.h
-    xmpp-im/xmpp_thumbs.h
-    xmpp-im/xmpp_agentitem.h
-    xmpp-im/xmpp_captcha.h
-    xmpp-im/xmpp_chatstate.h
-    xmpp-im/xmpp_discoitem.h
-    xmpp-im/xmpp_features.h
-    xmpp-im/xmpp_form.h
-    xmpp-im/xmpp_htmlelement.h
-    xmpp-im/xmpp_httpauthrequest.h
-    xmpp-im/xmpp_liveroster.h
-    xmpp-im/xmpp_liverosteritem.h
-    xmpp-im/xmpp_message.h
-    xmpp-im/xmpp_muc.h
-    xmpp-im/xmpp_reference.h
-    xmpp-im/xmpp_pubsubitem.h
-    xmpp-im/xmpp_pubsubretraction.h
-    xmpp-im/xmpp_receipts.h
-    xmpp-im/xmpp_resource.h
-    xmpp-im/xmpp_resourcelist.h
-    xmpp-im/xmpp_roster.h
-    xmpp-im/xmpp_rosteritem.h
-    xmpp-im/xmpp_rosterx.h
-    xmpp-im/xmpp_status.h
-    xmpp-im/xmpp_subsets.h
-    xmpp-im/xmpp_url.h
-    xmpp-im/xmpp_vcard.h
-    xmpp-im/xmpp_xdata.h
-    xmpp-im/xmpp_xmlcommon.h
-    xmpp-im/xmpp_encryption.h
-    xmpp-im/xmpp_externalservicediscovery.h
-    xmpp-im/stundisco.h
-
-    base/randomnumbergenerator.h
-    base/randrandomnumbergenerator.h
-    base/timezone.h
-
-    xmpp-im/im.h
-
-    jid/jid.h
-
-    sasl/digestmd5proplist.h
-    sasl/digestmd5response.h
-    sasl/plainmessage.h
-    sasl/scramsha1message.h
-    sasl/scramsha1response.h
-    sasl/scramsha1signature.h
-
-    blake2/blake2qt.h
-
-    xmpp-core/compressionhandler.h
-    xmpp-core/securestream.h
-    xmpp-core/xmpp.h
-    xmpp-core/xmpp_clientstream.h
-    xmpp-core/xmpp_stream.h
-
-    xmpp-im/xmpp_caps.h
-    xmpp-im/filetransfer.h
-    xmpp-im/httpfileupload.h
-    xmpp-im/s5b.h
-    xmpp-im/xmpp_bitsofbinary.h
-    xmpp-im/xmpp_bytestream.h
-    xmpp-im/xmpp_client.h
-    xmpp-im/xmpp_discoinfotask.h
-    xmpp-im/xmpp_ibb.h
-    xmpp-im/xmpp_serverinfomanager.h
-    xmpp-im/xmpp_task.h
-    xmpp-im/xmpp_tasks.h
-    xmpp-im/jingle.h
-    xmpp-im/jingle-connection.h
-    xmpp-im/jingle-transport.h
-    xmpp-im/jingle-nstransportslist.h
-    xmpp-im/jingle-application.h
-    xmpp-im/jingle-session.h
-    xmpp-im/jingle-ft.h
-    xmpp-im/jingle-ice.h
-    xmpp-im/jingle-s5b.h
-    xmpp-im/jingle-ibb.h
-    xmpp-im/jingle-file.h
-
-    zlib/zlibcompressor.h
-    zlib/zlibdecompressor.h
-    )
+add_library(iris)
 
-set(SOURCES
+target_sources(iris PRIVATE
     xmpp-core/compressionhandler.cpp
     xmpp-core/connector.cpp
     xmpp-core/parser.cpp
@@ -177,60 +72,57 @@ set(SOURCES
 
     xmpp-im/s5b.cpp
     xmpp-im/xmpp_features.cpp
-    )
+)
 
-if(JINGLE_SCTP)
-    list(APPEND SOURCES
+if(IRIS_ENABLE_JINGLE_SCTP)
+    target_compile_definitions(iris PRIVATE JINGLE_SCTP)
+    target_sources(iris PRIVATE
         xmpp-im/jingle-sctp.cpp
         xmpp-im/jingle-sctp-association_p.cpp
         xmpp-im/jingle-webrtc-datachannel_p.cpp
-        )
-
-    list(APPEND HEADERS
-        xmpp-im/jingle-sctp.h
-        xmpp-im/jingle-sctp-association_p.h
-        xmpp-im/jingle-webrtc-datachannel_p.h
-        )
-endif()
-
-if(NOT MSVC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+    )
 endif()
 
-add_library(iris
-    STATIC
-    ${HEADERS}
-    ${SOURCES}
-)
-
-set_property(TARGET iris PROPERTY C_STANDARD 11)
-
 if(B2_FOUND)
     message(STATUS "Building with system blake2 library")
-    target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
     target_link_libraries(iris PRIVATE ${B2_LIBRARY})
 else()
-    if (NOT BUNDLED_QCA)
+    if(NOT IRIS_BUNDLED_QCA)
         message(STATUS "No system blake2 and bundled QCA is disabled. Expect slow hashing.")
     endif()
     target_sources(iris PRIVATE
-            blake2/blake2b-ref.c
-            blake2/blake2s-ref.c
-            blake2/blake2.h
-            blake2/blake2-impl.h)
-    target_include_directories(iris PRIVATE blake2)
+        blake2/blake2b-ref.c
+        blake2/blake2s-ref.c
+    )
 endif()
 
+target_link_libraries(iris
+    PRIVATE
+        $<BUILD_INTERFACE:stringprep>
+        $<BUILD_INTERFACE:irisnet>
+        ZLIB::ZLIB
+    PUBLIC
+        ${Qca_LIBRARY}
+        Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml
+)
 
-target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
-target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
-target_link_libraries(iris PUBLIC ${qca_LIB})
-if (BUNDLED_QCA)
+if(IRIS_BUNDLED_QCA)
     add_dependencies(iris QcaProject)
-    include_directories(${Qca_INCLUDE_DIR})
-    target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
+    target_include_directories(iris PUBLIC ${Qca_INCLUDE_DIR})
     target_link_libraries(iris PUBLIC OpenSSL::SSL)
 endif()
 
-target_compile_definitions(iris INTERFACE IRISNET_STATIC)
-target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})
+if(IRIS_ENABLE_DEBUG)
+    target_compile_definitions(iris PRIVATE XMPP_TEST)
+endif()
+
+target_compile_definitions(iris PUBLIC IRISNET_STATIC)
+
+target_include_directories(iris
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/include/iris
+        ${CMAKE_SOURCE_DIR}/src
+        ${Qca_INCLUDE_DIR}
+    PUBLIC
+        $<INSTALL_INTERFACE:include/xmpp>
+)
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 7f2055d5..12e455c7 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -20,7 +20,7 @@
 #include "xmpp/jid/jid.h"
 
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "irisnet/corelib/irisnetglobal_p.h"
 #endif
 
 #include "qstringprep.h"
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 37a82025..b1ad1b7c 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -43,7 +43,7 @@
 
 #include "bytestream.h"
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "irisnet/corelib/irisnetglobal_p.h"
 #endif
 #include "protocol.h"
 #include "securestream.h"
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f99b5b36..8b8daab4 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -73,10 +73,10 @@
 #include "jingle-ice.h"
 #include "jingle-s5b.h"
 #include "jingle.h"
-#include "protocol.h"
 #include "s5b.h"
 #include "stundisco.h"
 #include "tcpportreserver.h"
+#include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
 #include "xmpp_externalservicediscovery.h"
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 9539aa51..9d38467f 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "im.h"
-#include "protocol.h"
+#include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_captcha.h"
 #include "xmpp_features.h"
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 4e7b5494..0b6a0ce3 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -93,7 +93,7 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 // JT_Session
 //----------------------------------------------------------------------------
 //
-#include "protocol.h"
+#include "xmpp/xmpp-core/protocol.h"
 
 JT_Session::JT_Session(Task *parent) : Task(parent) { }
 
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
index decd8e05..183db117 100644
--- a/tools/icetunnel/CMakeLists.txt
+++ b/tools/icetunnel/CMakeLists.txt
@@ -1,6 +1,16 @@
-project (ICETunnel LANGUAGES CXX)
+project(ICETunnel
+    LANGUAGES CXX
+)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD 17)
-add_executable (icetunnel main.cpp)
-target_link_libraries (icetunnel PUBLIC iris Qt::Core Qt::Network)
-target_compile_definitions(icetunnel PUBLIC QCA_STATIC)
+
+add_executable(icetunnel main.cpp)
+
+target_link_libraries(icetunnel PRIVATE iris Qt::Core Qt::Network)
+target_include_directories(icetunnel PRIVATE
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/include/iris
+    ${CMAKE_SOURCE_DIR}/src
+)
+target_compile_definitions(icetunnel PRIVATE QCA_STATIC)