updated generated headers/removed duplicates