minor changes to simplify includes for enduser