Remove extra includes.
Improve EXTENDED COPY error reporting.