Fix compilation issues on OS X - mainly #include file changes (Lars Immisch)

9 files changed