Restored required includes