Fixes for C++14 compatibility
Adds header files in Matrix project that were missing from previous commits