Moved a few procedures out of auto_include.ms