Update a couple of header inclusion guards