Added a couple missing include statements