C++ fixes

adding headers for std::array to allow successful compilation.

I had to add this lines to compile on my side

(cherry picked from commit 23bc6063)