Corrected missing headers due to last commit