Fixed includes & VS project