the only method it declares no longer exists, to inline its
includes into the places using it.

Change-Id: I1fed09835f221a34722dbdd3f33a079a373d8b36