A few useless includes removed
Separate a few more templates into decl/impl