Add headers for linux builds, fix format