Merge "remove dependency on unneeded headers"