The right choice is not to avoid duplicate inclusion but to include the standard #ifndef / #define / #endif structure to the header file that gets included multiple times.  Some of the header files have those, others don't (because I'm lazy).  So, please go ahead and add them, and amend your commit.