BOOTSTRAPS:COMMON  Fixed missing headers for linux and win32 in a99accc3