Avoid circular #includes to shut up lupdate

Avoid circular #includes to shut up lupdate

Even though those compiled flawlessly, lupdate complains about circular includes, so avoid
them. Requires un-inlining of some methods, unfortunately. On the upside, we now have a clearly
defined order for deleting gui-related objects on quit :)