I am going to say yes...I would include all items from the finance charge chart in the calculation of the MAPR.
The Federal register states: In general, any charge that is a finance charge under REgulation Z, adopted by the Bureau, as well as certain other charges that would be covered as interest under 10 U.S.C. 987 (i)(3) must be included in the calculation of the MAPR.
(3)Interest.—
The term “interest†includes all cost elements associated with the extension of credit, including fees, service charges, renewal charges, credit insurance premiums, any ancillary product sold with any extension of credit to a servicemember or the servicemember’s dependent, as applicable, and any other charge or premium with respect to the extension of consumer credit.