Header file mods for linux/OSX