diff -Nur a/divine/CMakeLists.txt b/divine/CMakeLists.txt
--- a/divine/CMakeLists.txt	2019-07-16 02:14:22.000000000 +0200
+++ b/divine/CMakeLists.txt	2019-07-26 11:29:25.713169571 +0200
@@ -90,5 +90,5 @@
     DEPENDS test-divine )
 add_dependencies( unit unit_divine )
 
-install( TARGETS divine-ui divine-vm divine-cc divine-ltl DESTINATION lib )
+install( TARGETS divine-ui divine-vm divine-cc divine-ltl divine-sim divine-mc divine-dbg divine-smt DESTINATION lib )
 install( FILES ${HPP} DESTINATION include/divine )

diff -Nur a/Makefile b/Makefile
--- a/Makefile	2019-07-16 02:14:03.000000000 +0200
+++ b/Makefile	2019-07-26 11:29:25.679836238 +0200
@@ -14,7 +14,7 @@
 RELEASE_BUILD_TYPE ?= RelWithDebInfo
 
 MAKEFLAGS ?= --no-print-directory
-OBJ ?= $(PWD)/_build.
+OBJ ?= $(CURDIR)/_build.
 BENCH_NAME ?= $(LOGNAME)
 EXTRA != if test "$(GENERATOR)" = Ninja && test -n "$(VERBOSE)"; then echo -v -d explain; fi; \
          if test -n "$(JOBS)"; then echo -j $(JOBS); fi
@@ -22,7 +22,7 @@
 TOOLDIR = $(OBJ)toolchain
 CLANG = $(TOOLDIR)/clang/
 RTBIN = $(TOOLDIR)/dios
-RTSRC = $(PWD)/dios
+RTSRC = $(CURDIR)/dios
 
 LIBUNWIND_LDIR = $(RTBIN)/libunwind/src
 CXX_LDIR = $(TOOLDIR)/lib
@@ -94,7 +94,7 @@
 	$(CMAKE) -E copy_if_different $(OBJ)$(FLAVOUR)/config.tmp $(OBJ)$(FLAVOUR)/config.vars
 	if ! test -e $(OBJ)$(FLAVOUR)/config.done || test -n "$(FORCE_CMAKE)"; then \
 	  chmod +x test/divine; \
-	  cd $(OBJ)$(FLAVOUR) && $(CMAKE) $(PWD) $(CMAKE_EXTRA) -G "$(GENERATOR)" && \
+	  cd $(OBJ)$(FLAVOUR) && $(CMAKE) $(CURDIR) $(CMAKE_EXTRA) -G "$(GENERATOR)" && \
 	  touch $(OBJ)$(FLAVOUR)/config.done; fi
 
 build: config

diff -Nur a/releng/install-rpath.cmake b/releng/install-rpath.cmake
--- a/releng/install-rpath.cmake	2019-07-16 02:14:40.000000000 +0200
+++ b/releng/install-rpath.cmake	2019-07-26 11:29:49.799835648 +0200
@@ -1,177 +1,233 @@
 # the list of all installed files affected by our rpath hack
-list( APPEND Fs lib/libLLVMSupport.so.3.7.0 )
-list( APPEND Fs lib/libLLVMTableGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMCore.so.3.7.0 )
-list( APPEND Fs lib/libLLVMIRReader.so.3.7.0 )
-list( APPEND Fs lib/libLLVMCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSelectionDAG.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMIRParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBitReader.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBitWriter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMTransformUtils.so.3.7.0 )
-list( APPEND Fs lib/libLLVMInstrumentation.so.3.7.0 )
-list( APPEND Fs lib/libLLVMInstCombine.so.3.7.0 )
-list( APPEND Fs lib/libLLVMScalarOpts.so.3.7.0 )
-list( APPEND Fs lib/libLLVMipo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMVectorize.so.3.7.0 )
-list( APPEND Fs lib/libLLVMObjCARCOpts.so.3.7.0 )
-list( APPEND Fs lib/libLLVMLinker.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAnalysis.so.3.7.0 )
-list( APPEND Fs lib/libLLVMipa.so.3.7.0 )
-list( APPEND Fs lib/libLLVMLTO.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMC.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMCParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMCDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMObject.so.3.7.0 )
-list( APPEND Fs lib/libLLVMOption.so.3.7.0 )
-list( APPEND Fs lib/libLLVMDebugInfoDWARF.so.3.7.0 )
-list( APPEND Fs lib/libLLVMDebugInfoPDB.so.3.7.0 )
-list( APPEND Fs lib/libLLVMExecutionEngine.so.3.7.0 )
-list( APPEND Fs lib/libLLVMInterpreter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMCJIT.so.3.7.0 )
-list( APPEND Fs lib/libLLVMOrcJIT.so.3.7.0 )
-list( APPEND Fs lib/libLLVMRuntimeDyld.so.3.7.0 )
-list( APPEND Fs lib/libLLVMTarget.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64CodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64Info.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64AsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64Disassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64AsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64Desc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAArch64Utils.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAMDGPUUtils.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMARMDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBPFCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBPFAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBPFInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMBPFDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMCppBackendCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMCppBackendInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMHexagonCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMHexagonInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMHexagonDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMHexagonDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMipsAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMSP430CodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMSP430AsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMSP430Info.so.3.7.0 )
-list( APPEND Fs lib/libLLVMMSP430Desc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMNVPTXCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMNVPTXInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMNVPTXAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMNVPTXDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPowerPCDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSparcDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMSystemZDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86CodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86AsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86Disassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86AsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86Desc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86Info.so.3.7.0 )
-list( APPEND Fs lib/libLLVMX86Utils.so.3.7.0 )
-list( APPEND Fs lib/libLLVMXCoreCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libLLVMXCoreDisassembler.so.3.7.0 )
-list( APPEND Fs lib/libLLVMXCoreAsmPrinter.so.3.7.0 )
-list( APPEND Fs lib/libLLVMXCoreInfo.so.3.7.0 )
-list( APPEND Fs lib/libLLVMXCoreDesc.so.3.7.0 )
-list( APPEND Fs lib/libLLVMAsmParser.so.3.7.0 )
-list( APPEND Fs lib/libLLVMLineEditor.so.3.7.0 )
-list( APPEND Fs lib/libLLVMProfileData.so.3.7.0 )
-list( APPEND Fs lib/libLLVMPasses.so.3.7.0 )
-list( APPEND Fs lib/libLLVMLibDriver.so.3.7.0 )
-list( APPEND Fs lib/libclangBasic.so.3.7.0 )
-list( APPEND Fs lib/libclangLex.so.3.7.0 )
-list( APPEND Fs lib/libclangParse.so.3.7.0 )
-list( APPEND Fs lib/libclangAST.so.3.7.0 )
-list( APPEND Fs lib/libclangASTMatchers.so.3.7.0 )
-list( APPEND Fs lib/libclangDynamicASTMatchers.so.3.7.0 )
-list( APPEND Fs lib/libclangSema.so.3.7.0 )
-list( APPEND Fs lib/libclangCodeGen.so.3.7.0 )
-list( APPEND Fs lib/libclangAnalysis.so.3.7.0 )
-list( APPEND Fs lib/libclangEdit.so.3.7.0 )
-list( APPEND Fs lib/libclangRewrite.so.3.7.0 )
-list( APPEND Fs lib/libclangARCMigrate.so.3.7.0 )
-list( APPEND Fs lib/libclangDriver.so.3.7.0 )
-list( APPEND Fs lib/libclangSerialization.so.3.7.0 )
-list( APPEND Fs lib/libclangFrontend.so.3.7.0 )
-list( APPEND Fs lib/libclangRewriteFrontend.so.3.7.0 )
-list( APPEND Fs lib/libclangFrontendTool.so.3.7.0 )
-list( APPEND Fs lib/libclangTooling.so.3.7.0 )
-list( APPEND Fs lib/libclangToolingCore.so.3.7.0 )
-list( APPEND Fs lib/libclangIndex.so.3.7.0 )
-list( APPEND Fs lib/libclangStaticAnalyzerCore.so.3.7.0 )
-list( APPEND Fs lib/libclangStaticAnalyzerCheckers.so.3.7.0 )
-list( APPEND Fs lib/libclangStaticAnalyzerFrontend.so.3.7.0 )
-list( APPEND Fs lib/libclangFormat.so.3.7.0 )
+list( APPEND Fs lib/libLLVMAArch64AsmParser.so )
+list( APPEND Fs lib/libLLVMAArch64AsmPrinter.so )
+list( APPEND Fs lib/libLLVMAArch64CodeGen.so )
+list( APPEND Fs lib/libLLVMAArch64Info.so )
+list( APPEND Fs lib/libLLVMAArch64Disassembler.so )
+list( APPEND Fs lib/libLLVMAArch64Desc.so )
+list( APPEND Fs lib/libLLVMAArch64Utils.so )
+list( APPEND Fs lib/libLLVMAggressiveInstCombine.so )
+list( APPEND Fs lib/libLLVMAMDGPUAsmParser.so )
+list( APPEND Fs lib/libLLVMAMDGPUAsmPrinter.so )
+list( APPEND Fs lib/libLLVMAMDGPUCodeGen.so )
+list( APPEND Fs lib/libLLVMAMDGPUDesc.so )
+list( APPEND Fs lib/libLLVMAMDGPUDisassembler.so )
+list( APPEND Fs lib/libLLVMAMDGPUInfo.so )
+list( APPEND Fs lib/libLLVMAMDGPUUtils.so )
+list( APPEND Fs lib/libLLVMAnalysis.so )
+list( APPEND Fs lib/libLLVMARMAsmParser.so )
+list( APPEND Fs lib/libLLVMARMAsmPrinter.so )
+list( APPEND Fs lib/libLLVMARMCodeGen.so )
+list( APPEND Fs lib/libLLVMARMDesc.so )
+list( APPEND Fs lib/libLLVMARMDisassembler.so )
+list( APPEND Fs lib/libLLVMARMInfo.so )
+list( APPEND Fs lib/libLLVMAsmParser.so )
+list( APPEND Fs lib/libLLVMAsmPrinter.so )
+list( APPEND Fs lib/libLLVMBinaryFormat.so )
+list( APPEND Fs lib/libLLVMBitReader.so )
+list( APPEND Fs lib/libLLVMBitWriter.so )
+list( APPEND Fs lib/libLLVMBPFAsmParser.so ) 
+list( APPEND Fs lib/libLLVMBPFAsmPrinter.so )
+list( APPEND Fs lib/libLLVMBPFCodeGen.so )
+list( APPEND Fs lib/libLLVMBPFDesc.so )
+list( APPEND Fs lib/libLLVMBPFDisassembler.so )
+list( APPEND Fs lib/libLLVMBPFInfo.so )
+list( APPEND Fs lib/libLLVMCodeGen.so )
+list( APPEND Fs lib/libLLVMCore.so )
+list( APPEND Fs lib/libLLVMCoroutines.so )
+list( APPEND Fs lib/libLLVMCoverage.so )
+list( APPEND Fs lib/libLLVMDebugInfoCodeView.so )
+list( APPEND Fs lib/libLLVMDebugInfoDWARF.so )
+list( APPEND Fs lib/libLLVMDebugInfoMSF.so )
+list( APPEND Fs lib/libLLVMDebugInfoPDB.so )
+list( APPEND Fs lib/libLLVMDemangle.so )
+list( APPEND Fs lib/libLLVMDlltoolDriver.so )
+list( APPEND Fs lib/libLLVMExecutionEngine.so )
+list( APPEND Fs lib/libLLVMFuzzMutate.so )
+list( APPEND Fs lib/libLLVMGlobalISel.so )
+list( APPEND Fs lib/libLLVMHexagonAsmParser.so )
+list( APPEND Fs lib/libLLVMHexagonCodeGen.so )
+list( APPEND Fs lib/libLLVMHexagonDesc.so )
+list( APPEND Fs lib/libLLVMHexagonDisassembler.so )
+list( APPEND Fs lib/libLLVMHexagonInfo.so )
+list( APPEND Fs lib/libLLVMInstCombine.so )
+list( APPEND Fs lib/libLLVMInstrumentation.so )
+list( APPEND Fs lib/libLLVMInterpreter.so )
+list( APPEND Fs lib/libLLVMipo.so )
+list( APPEND Fs lib/libLLVMIRReader.so )
+list( APPEND Fs lib/libLLVMLanaiAsmParser.so )
+list( APPEND Fs lib/libLLVMLanaiAsmPrinter.so )
+list( APPEND Fs lib/libLLVMLanaiCodeGen.so )
+list( APPEND Fs lib/libLLVMLanaiDesc.so )
+list( APPEND Fs lib/libLLVMLanaiDisassembler.so )
+list( APPEND Fs lib/libLLVMLanaiInfo.so )
+list( APPEND Fs lib/libLLVMLibDriver.so )
+list( APPEND Fs lib/libLLVMLineEditor.so )
+list( APPEND Fs lib/libLLVMLinker.so )
+list( APPEND Fs lib/libLLVMLTO.so )
+list( APPEND Fs lib/libLLVMMCDisassembler.so )
+list( APPEND Fs lib/libLLVMMCJIT.so )
+list( APPEND Fs lib/libLLVMMCParser.so )
+list( APPEND Fs lib/libLLVMMC.so )
+list( APPEND Fs lib/libLLVMMipsAsmParser.so )
+list( APPEND Fs lib/libLLVMMipsAsmPrinter.so )
+list( APPEND Fs lib/libLLVMMipsCodeGen.so )
+list( APPEND Fs lib/libLLVMMipsDesc.so )
+list( APPEND Fs lib/libLLVMMipsDisassembler.so )
+list( APPEND Fs lib/libLLVMMipsInfo.so )
+list( APPEND Fs lib/libLLVMMIRParser.so )
+list( APPEND Fs lib/libLLVMMSP430AsmPrinter.so )
+list( APPEND Fs lib/libLLVMMSP430CodeGen.so )
+list( APPEND Fs lib/libLLVMMSP430Desc.so )
+list( APPEND Fs lib/libLLVMMSP430Info.so )
+list( APPEND Fs lib/libLLVMNVPTXAsmPrinter.so )
+list( APPEND Fs lib/libLLVMNVPTXCodeGen.so )
+list( APPEND Fs lib/libLLVMNVPTXDesc.so )
+list( APPEND Fs lib/libLLVMNVPTXInfo.so )
+list( APPEND Fs lib/libLLVMObjCARCOpts.so )
+list( APPEND Fs lib/libLLVMObject.so )
+list( APPEND Fs lib/libLLVMObjectYAML.so )
+list( APPEND Fs lib/libLLVMOption.so )
+list( APPEND Fs lib/libLLVMOrcJIT.so )
+list( APPEND Fs lib/libLLVMPasses.so )
+list( APPEND Fs lib/libLLVMPowerPCAsmParser.so )
+list( APPEND Fs lib/libLLVMPowerPCAsmPrinter.so )
+list( APPEND Fs lib/libLLVMPowerPCCodeGen.so )
+list( APPEND Fs lib/libLLVMPowerPCDesc.so )
+list( APPEND Fs lib/libLLVMPowerPCDisassembler.so )
+list( APPEND Fs lib/libLLVMPowerPCInfo.so )
+list( APPEND Fs lib/libLLVMProfileData.so )
+list( APPEND Fs lib/libLLVMRuntimeDyld.so )
+list( APPEND Fs lib/libLLVMScalarOpts.so )
+list( APPEND Fs lib/libLLVMSelectionDAG.so )
+list( APPEND Fs lib/libLLVMSparcAsmParser.so )
+list( APPEND Fs lib/libLLVMSparcAsmPrinter.so )
+list( APPEND Fs lib/libLLVMSparcCodeGen.so )
+list( APPEND Fs lib/libLLVMSparcDesc.so )
+list( APPEND Fs lib/libLLVMSparcDisassembler.so )
+list( APPEND Fs lib/libLLVMSparcInfo.so )
+list( APPEND Fs lib/libLLVMSupport.so )
+list( APPEND Fs lib/libLLVMSymbolize.so )
+list( APPEND Fs lib/libLLVMSystemZAsmParser.so )
+list( APPEND Fs lib/libLLVMSystemZAsmPrinter.so )
+list( APPEND Fs lib/libLLVMSystemZCodeGen.so )
+list( APPEND Fs lib/libLLVMSystemZDesc.so )
+list( APPEND Fs lib/libLLVMSystemZDisassembler.so )
+list( APPEND Fs lib/libLLVMSystemZInfo.so )
+list( APPEND Fs lib/libLLVMTableGen.so )
+list( APPEND Fs lib/libLLVMTarget.so )
+list( APPEND Fs lib/libLLVMTransformUtils.so )
+list( APPEND Fs lib/libLLVMVectorize.so )
+list( APPEND Fs lib/libLLVMWindowsManifest.so )
+list( APPEND Fs lib/libLLVMX86AsmParser.so )
+list( APPEND Fs lib/libLLVMX86AsmPrinter.so )
+list( APPEND Fs lib/libLLVMX86CodeGen.so )
+list( APPEND Fs lib/libLLVMX86Desc.so )
+list( APPEND Fs lib/libLLVMX86Disassembler.so )
+list( APPEND Fs lib/libLLVMX86Info.so )
+list( APPEND Fs lib/libLLVMX86Utils.so )
+list( APPEND Fs lib/libLLVMXCoreAsmPrinter.so )
+list( APPEND Fs lib/libLLVMXCoreCodeGen.so )
+list( APPEND Fs lib/libLLVMXCoreDesc.so )
+list( APPEND Fs lib/libLLVMXCoreDisassembler.so )
+list( APPEND Fs lib/libLLVMXCoreInfo.so )
+list( APPEND Fs lib/libLLVMXRay.so )
+list( APPEND Fs lib/libclangAnalysis.so )
+list( APPEND Fs lib/libclangARCMigrate.so )
+list( APPEND Fs lib/libclangASTMatchers.so )
+list( APPEND Fs lib/libclangAST.so )
+list( APPEND Fs lib/libclangBasic.so )
+list( APPEND Fs lib/libclangCodeGen.so )
+list( APPEND Fs lib/libclangCrossTU.so )
+list( APPEND Fs lib/libclangDriver.so )
+list( APPEND Fs lib/libclangDynamicASTMatchers.so )
+list( APPEND Fs lib/libclangEdit.so )
+list( APPEND Fs lib/libclangFormat.so )
+list( APPEND Fs lib/libclangFrontend.so )
+list( APPEND Fs lib/libclangFrontendTool.so )
+list( APPEND Fs lib/libclangHandleCXX.so )
+list( APPEND Fs lib/libclangHandleLLVM.so )
+list( APPEND Fs lib/libclangIndex.so )
+list( APPEND Fs lib/libclangLex.so )
+list( APPEND Fs lib/libclangParse.so )
+list( APPEND Fs lib/libclangRewriteFrontend.so )
+list( APPEND Fs lib/libclangRewrite.so )
+list( APPEND Fs lib/libclangSema.so )
+list( APPEND Fs lib/libclangSerialization.so )
+list( APPEND Fs lib/libclangStaticAnalyzerCheckers.so )
+list( APPEND Fs lib/libclangStaticAnalyzerCore.so )
+list( APPEND Fs lib/libclangStaticAnalyzerFrontend.so )
+list( APPEND Fs lib/libclangToolingASTDiff.so )
+list( APPEND Fs lib/libclangToolingCore.so )
+list( APPEND Fs lib/libclangToolingInclusions.so )
+list( APPEND Fs lib/libclangToolingRefactor.so )
+list( APPEND Fs lib/libclangTooling.so )
+
+list( APPEND Fs bin/bugpoint )
+list( APPEND Fs bin/c-index-test )
+list( APPEND Fs bin/clang-7 )
+list( APPEND Fs bin/clang-check )
+list( APPEND Fs bin/clang-format )
+list( APPEND Fs bin/clang-func-mapping )
+list( APPEND Fs bin/clang-import-test )
+list( APPEND Fs bin/clang-offload-bundler )
+list( APPEND Fs bin/clang-refactor )
+list( APPEND Fs bin/clang-rename )
+list( APPEND Fs bin/diagtool )
 list( APPEND Fs bin/divine )
-list( APPEND Fs bin/llvm-tblgen )
-list( APPEND Fs bin/llvm-config )
-list( APPEND Fs bin/opt )
-list( APPEND Fs bin/llvm-as )
-list( APPEND Fs bin/llvm-dis )
-list( APPEND Fs bin/llvm-mc )
+list( APPEND Fs bin/dsymutil )
+list( APPEND Fs bin/git-clang-format )
+list( APPEND Fs bin/hmaptool )
 list( APPEND Fs bin/llc )
+list( APPEND Fs bin/lli )
 list( APPEND Fs bin/llvm-ar )
-list( APPEND Fs bin/llvm-nm )
-list( APPEND Fs bin/llvm-size )
+list( APPEND Fs bin/llvm-as )
+list( APPEND Fs bin/llvm-bcanalyzer )
+list( APPEND Fs bin/llvm-cat )
+list( APPEND Fs bin/llvm-cfi-verify )
+list( APPEND Fs bin/llvm-config )
 list( APPEND Fs bin/llvm-cov )
-list( APPEND Fs bin/llvm-profdata )
-list( APPEND Fs bin/llvm-link )
-list( APPEND Fs bin/lli )
-list( APPEND Fs bin/llvm-extract )
+list( APPEND Fs bin/llvm-c-test )
+list( APPEND Fs bin/llvm-cvtres )
+list( APPEND Fs bin/llvm-c-test )
+list( APPEND Fs bin/llvm-cxxdump )
+list( APPEND Fs bin/llvm-cxxfilt )
 list( APPEND Fs bin/llvm-diff )
-list( APPEND Fs bin/macho-dump )
+list( APPEND Fs bin/llvm-dis )
+list( APPEND Fs bin/llvm-dwarfdump )
+list( APPEND Fs bin/llvm-dwp )
+list( APPEND Fs bin/llvm-exegesis )
+list( APPEND Fs bin/llvm-extract )
+list( APPEND Fs bin/llvm-link )
+list( APPEND Fs bin/llvm-lto2 )
+list( APPEND Fs bin/llvm-mca )
+list( APPEND Fs bin/llvm-modextract )
+list( APPEND Fs bin/llvm-mt )
+list( APPEND Fs bin/llvm-nm )
+list( APPEND Fs bin/llvm-objcopy )
 list( APPEND Fs bin/llvm-objdump )
+list( APPEND Fs bin/llvm-opt-report )
+list( APPEND Fs bin/llvm-pdbutil )
+list( APPEND Fs bin/llvm-profdata )
+list( APPEND Fs bin/llvm-rc )
 list( APPEND Fs bin/llvm-readobj )
 list( APPEND Fs bin/llvm-rtdyld )
-list( APPEND Fs bin/llvm-dwarfdump )
-list( APPEND Fs bin/llvm-dsymutil )
-list( APPEND Fs bin/llvm-cxxdump )
-list( APPEND Fs bin/bugpoint )
-list( APPEND Fs bin/llvm-bcanalyzer )
+list( APPEND Fs bin/llvm-size )
+list( APPEND Fs bin/llvm-split )
 list( APPEND Fs bin/llvm-stress )
-list( APPEND Fs bin/llvm-mcmarkup )
-list( APPEND Fs bin/verify-uselistorder )
 list( APPEND Fs bin/llvm-symbolizer )
-list( APPEND Fs bin/llvm-c-test )
+list( APPEND Fs bin/llvm-tblgen )
+list( APPEND Fs bin/llvm-undname )
+list( APPEND Fs bin/llvm-xray )
 list( APPEND Fs bin/obj2yaml )
+list( APPEND Fs bin/opt )
+list( APPEND Fs bin/sancov )
+list( APPEND Fs bin/sanstats )
+list( APPEND Fs bin/scan-build )
+list( APPEND Fs bin/scan-view )
+list( APPEND Fs bin/sanstats )
+list( APPEND Fs bin/verify-uselistorder )
 list( APPEND Fs bin/yaml2obj )
-list( APPEND Fs bin/llvm-pdbdump )
-list( APPEND Fs bin/clang-3.7 )
-list( APPEND Fs bin/clang-format )
-list( APPEND Fs bin/clang-check )
 
 set( UNSET_RPATH "$ENV{BUILD_RPATH}" )
 
diff -Nur a/stp/lib/Interface/CMakeLists.txt b/stp/lib/Interface/CMakeLists.txt
--- a/stp/lib/Interface/CMakeLists.txt	2019-07-16 02:14:41.000000000 +0200
+++ b/stp/lib/Interface/CMakeLists.txt	2019-07-26 11:29:25.703169571 +0200
@@ -40,7 +40,7 @@
         add_custom_command(TARGET CopyPublicHeaders PRE_BUILD
                            COMMAND ${CMAKE_COMMAND} -E make_directory ${HEADER_DEST}
                            COMMAND ${CMAKE_COMMAND} -E echo "LEGACY: Copying ${public_header} to ${HEADER_DEST}"
-                           COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/include/stp/${public_header}" "${HEADER_DEST}/${public_header}"
+                           COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/stp/include/stp/${public_header}" "${HEADER_DEST}/${public_header}"
                           )
     endforeach()
 endif()