Added missing include dirs as defines