Consolidate custom includes into base includes