labath added a comment. The main code seems to be fine now, but linking of unit tests (check-lldb-unit target) fails now. You'll probably need to explicitly set their dependencies as well before this can be removed. https://reviews.llvm.org/D29352