Move comment to includes