add back headers which are still needed and add warning and error flags to detect...