Removed accidental inclusion of _impl header files.