waf: merge miscellaneous options to build options

gives more clarity! :)
waf: reorganize imports a little