Moved <array> include to correct files