Merge "Delete obsolete includes"