[PATCH 10/29] locking: Remove unused includes