Removed special header prefix __ and consider all headers