Clean up #includes to conform with coding standard