You don't seem to have rebased the branch onto trunk after the log2 merge, so this header isn't present, and this branch doesn't currently compile for me!