Log Message:
Some cleanups: organize variables in correct groups, drop an invalid
variable and sort buildlink includes alphabetically.