The patch removed unnecessary include header files,
and it also fixed duplicate error message definition.

Approved by Sunny Bains <sunny.bains@oracle.com>