diff --git a/native/cpp/CommonCpp/CMakeLists.txt b/native/cpp/CommonCpp/CMakeLists.txt
--- a/native/cpp/CommonCpp/CMakeLists.txt
+++ b/native/cpp/CommonCpp/CMakeLists.txt
@@ -31,3 +31,7 @@
 target_link_libraries(comm-cryptotools
   comm-tools
 )
+
+target_link_libraries(comm-databasemanagers
+  comm-cryptotools
+)
diff --git a/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt b/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt
@@ -0,0 +1,62 @@
+project(comm-databasemanagers)
+cmake_minimum_required(VERSION 3.4)
+
+include(GNUInstallDirs)
+
+find_package(folly REQUIRED)
+
+set(DBM_HDRS
+  "DatabaseManager.h"
+  "DatabaseQueryExecutor.h"
+  "SQLiteQueryExecutor.h"
+  "entities/Draft.h"
+  "entities/Media.h"
+  "entities/Message.h"
+  "entities/Metadata.h"
+  "entities/OlmPersistAccount.h"
+  "entities/OlmPersistSession.h"
+  "entities/Thread.h"
+)
+
+set(DBM_SRCS
+  "SQLiteQueryExecutor.cpp"
+)
+
+add_library(comm-databasemanagers
+  ${DBM_HDRS}
+  ${DBM_SRCS}
+)
+
+target_include_directories(comm-databasemanagers
+  PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  PRIVATE
+  # HACK
+  "../../../node_modules/react-native/ReactCommon/jsi"
+  "../../../node_modules/olm/include"
+)
+
+target_link_libraries(comm-databasemanagers
+  folly
+)
+
+install(TARGETS comm-databasemanagers EXPORT comm-databasemanagers-export
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT comm-databasemanagers
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-databasemanagers
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT comm-databasemanagers
+)
+
+install(FILES ${TOOLS_HDRS} DESTINATION include/comm/DatabaseManagers)
+
+set(_builddir_export_path cmake/comm-tools/comm-databasemanagers-targets.cmake)
+export(TARGETS comm-databasemanagers
+  NAMESPACE comm-databasemanagers::
+  FILE ${CMAKE_CURRENT_BINARY_DIR}/${_builddir_export_path}
+)
+
+# For installation
+install(EXPORT comm-databasemanagers-export
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/comm-databasemanagers
+  NAMESPACE comm-tools::
+)
diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../CryptoTools/Persist.h"
-#include "entities/Draft.h"
-#include "entities/Media.h"
-#include "entities/Message.h"
-#include "entities/OlmPersistAccount.h"
-#include "entities/OlmPersistSession.h"
-#include "entities/Thread.h"
+#include <CryptoTools/Persist.h>
+#include <DatabaseManagers/entities/Draft.h>
+#include <DatabaseManagers/entities/Media.h>
+#include <DatabaseManagers/entities/Message.h>
+#include <DatabaseManagers/entities/OlmPersistAccount.h>
+#include <DatabaseManagers/entities/OlmPersistSession.h>
+#include <DatabaseManagers/entities/Thread.h>
 
 #include <folly/Optional.h>
 
diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../CryptoTools/Persist.h"
-#include "DatabaseQueryExecutor.h"
-#include "entities/Draft.h"
+#include <CryptoTools/Persist.h>
+#include <DatabaseManagers/DatabaseQueryExecutor.h>
+#include <DatabaseManagers/entities/Draft.h>
 
 #include <mutex>
 #include <string>
diff --git a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
@@ -1,10 +1,10 @@
-#include "SQLiteQueryExecutor.h"
-#include "CommSecureStore.h"
-#include "Logger.h"
-#include "sqlite_orm.h"
+#include <DatabaseManagers/SQLiteQueryExecutor.h>
+#include <Tools/CommSecureStore.h>
+#include <Tools/Logger.h>
+#include <sqlite_orm.h>
 
-#include "entities/Media.h"
-#include "entities/Metadata.h"
+#include <DatabaseManagers/entities/Media.h>
+#include <DatabaseManagers/entities/Metadata.h>
 #include <sqlite3.h>
 #include <cerrno>
 #include <cstdio>