Revert r348070
Konstantin points out that lockmgr probably requires the whole lock.h anyway.
Requested by: kib