Move matrix includes to .h