Updated headers, libs and project file