More includes with user-include syntax.
Updated BuiltinFunction definition to match usages.