Update includes, fix compilation against newer GCC environment#7

wtfbbqhax wants to merge 2 commits intocrc181:mastercrc181/abcip:masterfrom

wtfbbqhax:masterwtfbbqhax/abcip:masterCopy head branch name to clipboard