OTPayment decoupling and include cleanup.