Log Message: Reapply 1.37, but split the dependencies correctly into the header and library dependency.