Fix headers for gcc