Remove use of gnulib (part 2)