Add includes missing after cleanup in root.