Added missing source file and fixed header