Removed unnecessary includes. Added MapData.