Added missing include statements