Removes obsolete and redundant headers from main core header file.