additional includes required for recent macro refactoring.