Multiple include prevention: Add for matrix.cpp
and edit for existing to reflect it being C++