Remove unused header includes