Hmm, I did not change anything inside the if..endif blocks beside indentation. It's only git's diff logic that produces this confusing output. Line 111 is in 107 in the new file now. The Types.hpp header was generated in line 130 in the previous version. 
If any renaming is required here, that's another issue.