- Mostly effects of the SparseMatrix redesign. - Plus some missing includes. Former-commit-id: 11c5bc9970
11c5bc9970