Added missing includes (fixes OS X compilation)