I didn't have this issue when I tried to compile you branch.
After I fixed the includes.