Header files should have an include guard. (You don't need to update your diff, I added it manually)