Git is a mess. I think this makes stuff work, at least they compile now.