Refactor some includes.