Removed unused header includes