Merge pull request #10860 from keszybz/more-cleanup-2

Do more stuff from main macros

diff --cc src/core/main.c
Simple merge

diff --cc src/tmpfiles/tmpfiles.c
Simple merge