refs #828 Remove namespace_details files, fix up includes