Added missing requires and includes