Clean up order of includes