added conditional inclusions for ensuring headers only get added once