Rearrange some #includes to keep MSVC happy
Add newly introduced sources to MSVC project

(xfade_curve stuff)