Removed unnecessary includes from header files.