You include fees that-
1. meet the definition of FCs, and
2. are required by contract between lender and borrower.
If the lender is waiving fes, then that effectively amends the contract so the borrower is no longer required to pay them.
_________________________
...gone fishing.