Changed to all includes from (AREA_DETECTOR) are optional
Made all includes of AREA_DETECTOR files be optional