Minor cleanup in the servo library includes.