Log Message:
For the sake of MKPIE, we need to .include Makefile.common before
options.mk.

Since Makefile.common now does not see the x11 option, we have to move
all x11 related commands into options.mk. Within options, move
.includes to the end for consistency.