Adding templates 2f per node fwddefs and public headers