diff --git a/CMakeLists.txt b/CMakeLists.txt
index 404391d8bb..31b40ee95e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,11 @@ set(BUILD_TESTS OFF CACHE BOOL "Build json-schema-validator-tests")
 
 # Make nlohmann_json_schema_validator happy by telling it how to find the single include of nlohmann_json
 include_directories(external/json/single_include/)
+
+if (PHASAR_IN_TREE)
+  set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator)
+endif()
+
 set(nlohmann_json_DIR ${PHASAR_SRC_DIR}/external/json/single_include/)
 
 # Json Schema Validator
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt b/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
index 72215d91c3..198439057e 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlowSolver/Mono/CMakeLists.txt
@@ -5,6 +5,7 @@ set(PHASAR_LINK_LIBS
   phasar_utils
   phasar_phasarllvm_utils
   phasar_db
+  phasar_taintconfig
 )
 
 set(LLVM_LINK_COMPONENTS
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake b/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake
index 499130c02d..de8793ff77 100644
--- a/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake
+++ b/lib/PhasarLLVM/DataFlowSolver/Mono/phasar_mono-config.cmake
@@ -11,6 +11,7 @@ list(APPEND
   utils
   phasarllvm_utils
   db
+  taintconfig
 )
 
 foreach(dep ${PHASAR_MONO_DEPS})
diff --git a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
index 14d6c6e9e0..bbe3cd5a5f 100644
--- a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
+++ b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
@@ -2,6 +2,13 @@ file(GLOB_RECURSE TAINTCONFIG_SRC *.h *.cpp)
 
 set(PHASAR_LINK_LIBS
   phasar_utils
+  phasar_db
+  phasar_phasarllvm_utils
+)
+
+set(LLVM_LINK_COMPONENTS
+  Core
+  Support
 )
 
 if(BUILD_SHARED_LIBS)
diff --git a/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake b/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake
index 23be4f3098..bf8c74de16 100644
--- a/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake
+++ b/lib/PhasarLLVM/TaintConfig/phasar_taintconfig-config.cmake
@@ -3,6 +3,8 @@ set(PHASAR_taintconfig_COMPONENT_FOUND 1)
 list(APPEND
   PHASAR_TAINTCONFIG_DEPS
   utils
+  db
+  phasarllvm_utils
 )
 
 foreach(dep ${PHASAR_TAINTCONFIG_DEPS})