Improve variants (include headers.inc.php)