Fix broken build

Someone (me) moved a header without updating the #includes. Should
finally be fixed.
Update .gitignore