Fix non-C99 variable declarations