GitLab

This reverts commit 65f68f7b.

These are not strictly necessary, as other headers include <memory>.

This is an offshoot from #2391. There's no need to create yet another
ticket for it.

Also fix typos in afsdb_18.cc doxygen comments.

This avoids an extra ungetToken() and cuts down on some code too.

Also adjust tests.