Build cleanly with gcc's -Werror=declaration-after-statement flag