Also did some Makefile cleanup and reordering to make linters happy PR: 275399 Reported by: Siva Mahadevan <me@svmhdvn.name> Approved by: Rafael Grether <devnull@apt322.org> (maintainer)
