Remove unused (AFAICT) file inclusions.  Fix bug from recent change