Same as with the previous gtphub commit. Make these static to deal with the new semantic of inline in gcc5.