Made all includes of AREA_DETECTOR files be optional