Fix Merge Mistakes: first use in func: missing headers/functions