Removed unnecessary headers; fix gcc build.