More restoration.
Make additional changes to get compilation working with gnulib.