Only for makefiles.
Merge topic 'minor-cleanups' into next

24f1931 Only for makefiles.