Clean up build includes/excludes