Everything should now compile with a C89 compiler.