Addedd missing cpp files for windows singleton fix