Move builtin.makefile below control.makefile