Merge "Cleanup of includes/rcfeed"