Add make rules for new impl files
Correct header includes; add expl instantiations