Fix 3rd headers