Switch back to C99 / ANSI C (at least for now)