Adjust include order and update find script