diff --git a/native/cpp/CommonCpp/CMakeLists.txt b/native/cpp/CommonCpp/CMakeLists.txt
index bbd09b441..67d0032e4 100644
--- a/native/cpp/CommonCpp/CMakeLists.txt
+++ b/native/cpp/CommonCpp/CMakeLists.txt
@@ -1,12 +1,17 @@
 project(comm-common-cpp)
 
 # 3.13+ required for CMP0079 to be set
 cmake_minimum_required(VERSION 3.13)
 
 include(GNUInstallDirs)
 
 add_subdirectory(grpc)
 add_subdirectory(CryptoTools)
 add_subdirectory(DatabaseManagers)
 add_subdirectory(NativeModules)
 add_subdirectory(Tools)
+
+target_link_libraries(comm-cryptotools
+  comm-tools
+  comm-databasemanagers
+)
diff --git a/native/cpp/CommonCpp/CryptoTools/CMakeLists.txt b/native/cpp/CommonCpp/CryptoTools/CMakeLists.txt
index fb45441b2..0b7483f69 100644
--- a/native/cpp/CommonCpp/CryptoTools/CMakeLists.txt
+++ b/native/cpp/CommonCpp/CryptoTools/CMakeLists.txt
@@ -1,60 +1,59 @@
 project(comm-cryptotools)
 cmake_minimum_required(VERSION 3.4)
 
 include(GNUInstallDirs)
 
 set(CMAKE_CXX_STANDARD 14)
 
 set(CRYPTO_HDRS
   "CryptoModule.h"
   "Persist.h"
   "Session.h"
   "Tools.h"
 )
 
 set(CRYPTO_SRCS
   "CryptoModule.cpp"
   "Session.cpp"
   "Tools.cpp"
 )
 
 add_library(comm-cryptotools
   ${CRYPTO_HDRS}
   ${CRYPTO_SRCS}
 )
 
 find_package(Olm)
 
 target_link_libraries(comm-cryptotools
   Olm::Olm
 )
 
 # reference local directory when building, use installation path when installing
 target_include_directories(comm-cryptotools
   PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Tools>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
 install(TARGETS comm-cryptotools EXPORT comm-cryptotools-export
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT comm-cryptotools
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-cryptotools
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-cryptotools
 )
 
 install(FILES ${TOOLS_HDRS} DESTINATION include/Tools)
 
 set(_builddir_export_path cmake/comm-cryptotools/comm-cryptotools-targets.cmake)
 export(TARGETS comm-cryptotools
   NAMESPACE comm-cryptotools::
   FILE ${CMAKE_CURRENT_BINARY_DIR}/${_builddir_export_path}
 )
 
 # For installation
 install(EXPORT comm-cryptotools-export
   FILE comm-cryptotools-targets.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/comm-cryptotools
   NAMESPACE comm-cryptotools::
 )