Comment out unused header includes