Update headers for gcc 4.4