[PATCH 0/5] Fix inclusion guards