moved macros into vserver-internal